Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker

Make SpotBugs happy
Merge pull request #289 from weblate/weblate-catima-catima
2025-12-24 15:47:53 -05:00 · 2021-07-25 21:52:10 +02:00 · 2021-07-25 21:51:46 +02:00 · 2021-07-25 21:41:26 +02:00 · 2021-07-25 21:40:25 +02:00 · 2021-07-25 21:40:15 +02:00
272 changed files with 11152 additions and 3241 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -13,6 +13,7 @@ jobs:

    steps:
    - uses: actions/checkout@v2
+    - uses: gradle/wrapper-validation-action@v1
    - name: set up JDK 1.8
      uses: actions/setup-java@v1
      with:
@@ -23,5 +24,11 @@ jobs:
      run: ./gradlew lintRelease
    - name: Run unit tests
      run: ./gradlew testReleaseUnitTest
-    - name: FindBugs
-      run: ./gradlew findbugs
+    - name: SpotBugs
+      run: ./gradlew spotbugsRelease
+    - name: Archive test results
+      if: always()
+      uses: actions/upload-artifact@v2
+      with:
+        name: test-results
+        path: app/build/reports
--- a/.gitignore
+++ b/.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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,213 @@
+# Changelog
+
+## v2.0.2 (2021-07-25)
+
+Changes:
+
+- Fix inability to configure photos in new loyalty card
+
+## v2.0.1 (2021-07-21)
+
+Changes:
+
+- Several minor translation and UI fixes
+- Fix crash in import/sharing loyalty card on Android 6
+
+## v2.0 (2021-07-14)
+
+Breaking changes:
+- The backup format changed, see https://github.com/TheLastProject/Catima/wiki/Export-format
+- The URL sharing format changed, see https://github.com/TheLastProject/Catima/wiki/Card-sharing-URL-format
+
+Changes:
+
+- Make it possible to enable or disable the flashlight while scanning
+- Add UPC-E support
+- Support adding a front and back photo to each card
+- Support importing password-protected zip files
+- Support importing from Stocard (Beta)
+- Fix useless whitespace in notes from Fidme import
+- Support new Voucher Vault export format
+- Fix Floating Action Buttons being behind other UI elements on Android 4
+- Fix loyalty card viewer appbar top margin
+
+## v1.14.1 (2021-06-14)
+
+Changes:
+
+- Add missing barcode ID to export
+- Don't show update barcode dialog if value is the same as card ID
+- Add Finnish translation
+
+## v1.14 (2021-06-07)
+
+Changes:
+
+- 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
@@ -8,17 +215,20 @@ Changes:
 ## 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
@@ -29,6 +239,7 @@ Changes:
 ## 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))
@@ -36,6 +247,7 @@ Changes:
 ## 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))
@@ -43,11 +255,13 @@ Changes:
 ## 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))
@@ -57,178 +271,203 @@ Changes:
 - 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
+  - German
+  - Italian
+  - Dutch
+  - Polish
+  - Russian

 ## v0.25.4 (2019-10-04)

-Changes
+Changes:
+
 - Enable app backups
 - Update French and Slovenian translations

 ## v0.25.3 (2019-03-02)

-Changes
+Changes:
+
 - Update Russian translations

 ## v0.25.2 (2019-01-05)
-  
-Changes
+
+Changes:
+
 - Update and add translations

 ## v0.25.1 (2018-10-14)

 Changes:
- Fix creating new card by manually entering barcode (https://github.com/brarcher/loyalty-card-locker/issues/272)
+
+- 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 (https://github.com/brarcher/loyalty-card-locker/pull/266)
- Add setting to lock orientation for all cards (https://github.com/brarcher/loyalty-card-locker/pull/269)
+
+- 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 (https://github.com/brarcher/loyalty-card-locker/pull/259)
- Add Greek translations (https://github.com/brarcher/loyalty-card-locker/pull/252)
- Add Slovenian translations (https://github.com/brarcher/loyalty-card-locker/pull/260)
- Update translations (https://github.com/brarcher/loyalty-card-locker/pull/260, https://github.com/brarcher/loyalty-card-locker/pull/254)
+
+- 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 (https://github.com/brarcher/loyalty-card-locker/pull/244)
- Update translations (https://github.com/brarcher/loyalty-card-locker/pull/244)
+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 (https://github.com/brarcher/loyalty-card-locker/pull/232)
-  * Spanish (https://github.com/brarcher/loyalty-card-locker/pull/232)
-  * Slovak (https://github.com/brarcher/loyalty-card-locker/pull/232)
- Updated translations (https://github.com/brarcher/loyalty-card-locker/pull/239)
+  - 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. (https://github.com/brarcher/loyalty-card-locker/pull/226)
- Remove usage of legacy apache library, used only in unit tests but no longer needed. (https://github.com/brarcher/loyalty-card-locker/pull/225)
+
+- 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. (https://github.com/brarcher/loyalty-card-locker/pull/219)
+
+- 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. (https://github.com/brarcher/loyalty-card-locker/pull/213)
- Disable beep when scanning a barcode. (https://github.com/brarcher/loyalty-card-locker/pull/216)
+
+- 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. (https://github.com/brarcher/loyalty-card-locker/pull/208)
- Barcode rendering updates: (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. 
+
+- 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. (https://github.com/brarcher/loyalty-card-locker/pull/200)
- Add options to configure the colors used for the store name font and background. (https://github.com/brarcher/loyalty-card-locker/pull/203)
- Add options to adjust font sizes on the card listing page and single card page. (https://github.com/brarcher/loyalty-card-locker/pull/204)
+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. (https://github.com/brarcher/loyalty-card-locker/pull/197)
+
+- 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. (https://github.com/brarcher/loyalty-card-locker/pull/188)
- Improved layout when viewing a card. (https://github.com/brarcher/loyalty-card-locker/pull/190)
+
+- 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). (https://github.com/brarcher/loyalty-card-locker/pull/184)
+
+- 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. (https://github.com/brarcher/loyalty-card-locker/pull/177)
- Fix importing backups directly from the file system. (https://github.com/brarcher/loyalty-card-locker/pull/180)
- Fix importing backups from certain types of content providers. (https://github.com/brarcher/loyalty-card-locker/pull/179)
+
+- 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. (https://github.com/brarcher/loyalty-card-locker/pull/170)
- New icon and color scheme. (https://github.com/brarcher/loyalty-card-locker/pull/171)
+
+- 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. (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. (https://github.com/brarcher/loyalty-card-locker/pull/163)
+
+- 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. (https://github.com/brarcher/loyalty-card-locker/pull/155)
- Remove widget, as it was a poor substitute for shortcuts. (https://github.com/brarcher/loyalty-card-locker/pull/155)
- Fix exporting backups on Android 7+. (https://github.com/brarcher/loyalty-card-locker/pull/153)
- Report more accurate mime type when exporting backup data. (https://github.com/brarcher/loyalty-card-locker/pull/156)
- Fix bug where a card could not be edited. (https://github.com/brarcher/loyalty-card-locker/pull/155)
+
+- 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)

@@ -236,43 +475,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
@@ -284,17 +530,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)
@@ -303,7 +550,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
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
  remote: https://rubygems.org/
  specs:
    CFPropertyList (3.0.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
    atomos (0.1.3)
    aws-eventstream (1.1.0)
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +0,0 @@
-/build
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,77 +1,108 @@
-apply plugin: 'com.android.application'
-apply plugin: 'findbugs'
+import com.github.spotbugs.snom.SpotBugsTask

-findbugs {
-    sourceSets = []
+apply plugin: 'com.android.application'
+apply plugin: 'com.github.spotbugs'
+
+spotbugs {
    ignoreFailures = false
+    effort = 'max'
+    excludeFilter = file("./config/spotbugs/exclude.xml")
+    reportsDir = file("$buildDir/reports/spotbugs/")
 }

 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"

    defaultConfig {
        applicationId "me.hackerchick.catima"
-        minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 43
-        versionName "1.1.0"
+        minSdkVersion 19
+        targetSdkVersion 30
+        versionCode 72
+        versionName "2.0.2"
+
+        vectorDrawables.useSupportLibrary true
    }
+
    buildTypes {
        release {
-            minifyEnabled false
+            minifyEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            resValue "string", "app_name", "Catima"
        }
        debug {
            applicationIdSuffix ".debug"
+            resValue "string", "app_name", "Catima Debug"
        }
    }
+
+    compileOptions {
+        encoding "UTF-8"
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
    lintOptions {
-        disable "GoogleAppIndexingWarning"
-        disable "ButtonStyle"
-        disable "AlwaysShowAction"
-        disable "MissingTranslation"
-        disable "MissingPrefix"
+        disable "GoogleAppIndexingWarning", "ButtonStyle", "AlwaysShowAction",
+                "MissingTranslation", "MissingPrefix"
+    }
+
+    sourceSets {
+        test {
+            resources.srcDirs += ['src/test/res']
+        }
    }

    // Starting with Android Studio 3 Robolectric is unable to find resources.
    // The following allows it to find the resources.
    testOptions {
        unitTests {
-            includeAndroidResources = true
+            all {
+                testLogging {
+                    events 'started', 'passed', 'skipped', 'failed'
+                }
+            }
+            includeAndroidResources true
        }
    }
 }

 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'androidx.appcompat:appcompat:1.2.0'
-    compile 'com.google.android.material:material:1.2.1'
-    compile 'androidx.legacy:legacy-support-v4:1.0.0'
-    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.5'
-    compile 'androidx.constraintlayout:constraintlayout:1.1.3'
-    compile 'com.jaredrummler:colorpicker:1.0.2'
-    compile group: 'com.google.guava', name: 'guava', version: '20.0'
-    compile 'com.github.apl-devs:appintro:v4.2.0'
-    compile "com.vanniktech:vntnumberpickerpreference:1.0.0"
+// AndroidX
+    implementation 'androidx.appcompat:appcompat:1.2.0'
    implementation 'androidx.cardview:cardview:1.0.0'
-    testCompile 'junit:junit:4.12'
-    testCompile "org.robolectric:robolectric:4.0.2"
+    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'
+    implementation 'net.lingala.zip4j:zip4j:2.8.0'
+
+// 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/javac/debug/compileDebugJavaWithJavac/classes')
-    source = fileTree('src/main/java')
-    classpath = files()
-
-    effort = 'max'
-
-    excludeFilter = file("./config/findbugs/exclude.xml")
+    //classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
+    //source = fileTree('src/main/java')
+    //classpath = files()

    reports {
        xml.enabled = false
--- a/app/config/spotbugs/exclude.xml
+++ b/app/config/spotbugs/exclude.xml
--- a/app/release/app-release.apk
+++ b/app/release/app-release.apk
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":41,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
--- a/app/src/androidTest/java/protect/card_locker/ApplicationTest.java
+++ b/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);
-    }
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/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,6 +17,8 @@
        android:name="android.hardware.camera.autofocus"
        android:required="false" />

+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+
    <application
        android:name=".LoyaltyCardLockerApplication"
        android:allowBackup="true"
@@ -33,6 +36,11 @@
                <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"
@@ -41,7 +49,6 @@
        <activity
            android:name=".LoyaltyCardViewActivity"
            android:theme="@style/AppTheme.NoActionBar"
-            android:label=""
            android:windowSoftInputMode="stateHidden"
            android:exported="true"/>
        <activity
@@ -53,15 +60,22 @@
                <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/” -->
+                <!-- Listen to known card sharing URIs -->
                <data android:scheme="https"
-                    android:host="@string/intent_import_card_from_url_host"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
+                    android:host="@string/intent_import_card_from_url_host_catima_app"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_catima_app" />
                <data android:scheme="https"
-                    android:host="@string/intent_import_card_from_url_host_old"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_old" />
+                    android:host="@string/intent_import_card_from_url_host_thelastproject"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_thelastproject" />
+                <data android:scheme="https"
+                    android:host="@string/intent_import_card_from_url_host_brarcher"
+                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_brarcher" />
            </intent-filter>
        </activity>
+        <activity
+            android:name=".ScanActivity"
+            android:label="@string/scanCardBarcode"
+            android:theme="@style/AppTheme.NoActionBar"/>
        <activity
            android:name=".BarcodeSelectorActivity"
            android:label="@string/selectBarcodeTitle"
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -0,0 +1,108 @@
+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("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Guava", "https://github.com/google/guava", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
+
+        final List<ThirdPartyInfo> USED_ASSETS = new ArrayList<>();
+        USED_ASSETS.add(new ThirdPartyInfo("Android icons", "https://fonts.google.com/icons?selected=Material+Icons", "Apache 2.0"));
+
+        StringBuilder libs = new StringBuilder().append("<br/>");
+        for (ThirdPartyInfo entry : USED_LIBRARIES)
+        {
+            libs.append("<br/><a href=\"").append(entry.url()).append("\">").append(entry.name()).append("</a> (").append(entry.license()).append(")<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);
+    }
+}
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -1,6 +1,8 @@
 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;
@@ -23,6 +25,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
    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;
@@ -30,14 +35,20 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>

    private final WeakReference<ImageView> imageViewReference;
    private final WeakReference<TextView> textViewReference;
-    private final String cardId;
+    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, TextView textView)
+                           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);
@@ -59,11 +70,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
            double ratio = (double)MAX_WIDTH / (double)imageView.getWidth();
            imageHeight = (int)(imageView.getHeight() * ratio);
        }
-    }

-    BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
-    {
-        this(imageView, cardIdString, barcodeFormat, null);
+        this.showFallback = showFallback;
    }

    private int getMaxWidth(BarcodeFormat format)
@@ -96,7 +104,43 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
        }
    }

-    public Bitmap doInBackground(Void... params)
+    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";
+            case UPC_E:
+                return "0123456";
+            default:
+                throw new IllegalArgumentException("No fallback known for this barcode type");
+        }
+    }
+
+    private Bitmap generate()
    {
        if (cardId.isEmpty())
        {
@@ -165,13 +209,30 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
        catch(OutOfMemoryError e)
        {
            Log.w(TAG, "Insufficient memory to render barcode, "
-                + imageWidth + "x" + imageHeight + ", " + format.name()
-                + ", length=" + cardId.length(), e);
+                    + imageWidth + "x" + imageHeight + ", " + format.name()
+                    + ", length=" + cardId.length(), e);
        }

        return null;
    }

+    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);
@@ -182,6 +243,8 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
            return;
        }

+        imageView.setTag(isSuccesful);
+
        imageView.setImageBitmap(result);
        TextView textView = textViewReference.get();

@@ -190,6 +253,12 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
            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());
@@ -203,5 +272,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
                textView.setVisibility(View.GONE);
            }
        }
+
+        if (callback != null) {
+            callback.run();
+        }
    }
 }
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
@@ -3,11 +3,7 @@ package protect.card_locker;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -18,6 +14,7 @@ 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;
@@ -28,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
@@ -57,7 +58,8 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                BarcodeFormat.ITF.name(),
                BarcodeFormat.PDF_417.name(),
                BarcodeFormat.QR_CODE.name(),
-                BarcodeFormat.UPC_A.name()
+                BarcodeFormat.UPC_A.name(),
+                BarcodeFormat.UPC_E.name()
        ));

    private Map<String, Pair<Integer, Integer>> barcodeViewMap;
@@ -89,6 +91,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                .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))
+                .put(BarcodeFormat.UPC_E.name(), new Pair<>(R.id.upceBarcode, R.id.upceBarcodeText))
                .build();

        EditText cardId = findViewById(R.id.cardId);
@@ -105,20 +108,7 @@ 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();
-
-                // Update barcodes
-                for(String key : barcodeViewMap.keySet())
-                {
-                    ImageView image = findViewById(barcodeViewMap.get(key).first);
-                    TextView text = findViewById(barcodeViewMap.get(key).second);
-                    createBarcodeOption(image, key, s.toString(), text);
-                }
+                generateBarcodes(s.toString());

                View noBarcodeButtonView = findViewById(R.id.noBarcode);
                setButtonListener(noBarcodeButtonView, s.toString());
@@ -138,6 +128,25 @@ public class BarcodeSelectorActivity extends AppCompatActivity
        if(initialCardId != null)
        {
            cardId.setText(initialCardId);
+        } else {
+            generateBarcodes("");
+        }
+    }
+
+    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);
        }
    }

@@ -172,6 +181,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);
@@ -191,17 +206,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, text);
+                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text, true, null);
                        barcodeGeneratorTasks.add(task);
                        task.execute();
                    }
@@ -210,7 +218,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
        else
        {
            Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
+            BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text, true, null);
            barcodeGeneratorTasks.add(task);
            task.execute();
        }
--- a/app/src/main/java/protect/card_locker/BarcodeValues.java
+++ b/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;
+    }
+}
--- a/app/src/main/java/protect/card_locker/BaseCursorAdapter.java
+++ b/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;
+        }
+    }
+}
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -4,24 +4,26 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.os.Parcelable;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
 import android.widget.Toast;

+import 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
+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)
-    {
+    public void onCreate(Bundle bundle) {
        super.onCreate(bundle);

        // Set the result to CANCELED.  This will cause nothing to happen if the
@@ -32,52 +34,66 @@ public class CardShortcutConfigure extends AppCompatActivity
        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)
-        {
+        if (db.getLoyaltyCardCount() == 0) {
            Toast.makeText(this, R.string.noCardsMessage, Toast.LENGTH_LONG).show();
            finish();
        }

-        final ListView cardList = findViewById(R.id.list);
+        final RecyclerView cardList = findViewById(R.id.list);
        cardList.setVisibility(View.VISIBLE);

        Cursor cardCursor = db.getLoyaltyCardCursor();

-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
+        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
        cardList.setAdapter(adapter);
+    }

-        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
-        {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-            {
-                Cursor selected = (Cursor) parent.getItemAtPosition(position);
-                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
+    private void onClickAction(int position) {
+        Cursor selected = mDb.getLoyaltyCardCursor();
+        selected.moveToPosition(position);
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);

-                Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);
+        Log.d(TAG, "Creating shortcut for card " + loyaltyCard.store + "," + loyaltyCard.id);

-                Intent shortcutIntent = new Intent(CardShortcutConfigure.this, LoyaltyCardViewActivity.class);
-                shortcutIntent.setAction(Intent.ACTION_MAIN);
-                // Prevent instances of the view activity from piling up; if one exists let this
-                // one replace it.
-                shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-                Bundle bundle = new Bundle();
-                bundle.putInt("id", loyaltyCard.id);
-                bundle.putBoolean("view", true);
-                shortcutIntent.putExtras(bundle);
+        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);
+        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();
-            }
-        });
+        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
    }
 }
--- a/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java
+++ b/app/src/main/java/protect/card_locker/CsvDatabaseExporter.java
@@ -1,106 +0,0 @@
-package protect.card_locker;
-
-import android.database.Cursor;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-
-/**
- * Class for exporting the database into CSV (Comma Separate Values)
- * format.
- */
-public class CsvDatabaseExporter implements DatabaseExporter
-{
-    public void exportData(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException
-    {
-        CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
-
-        // Print the version
-        printer.printRecord("2");
-
-        printer.println();
-
-        // Print the header for groups
-        printer.printRecord(DBHelper.LoyaltyCardDbGroups.ID);
-
-        Cursor groupCursor = db.getGroupCursor();
-
-        while(groupCursor.moveToNext())
-        {
-            Group group = Group.toGroup(groupCursor);
-
-            printer.printRecord(group._id);
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        groupCursor.close();
-
-        // Print an empty line
-        printer.println();
-
-        // Print the header for cards
-        printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
-                DBHelper.LoyaltyCardDbIds.STORE,
-                DBHelper.LoyaltyCardDbIds.NOTE,
-                DBHelper.LoyaltyCardDbIds.CARD_ID,
-                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
-                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
-                DBHelper.LoyaltyCardDbIds.STAR_STATUS);
-
-        Cursor cardCursor = db.getLoyaltyCardCursor();
-
-        while(cardCursor.moveToNext())
-        {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
-
-            printer.printRecord(card.id,
-                    card.store,
-                    card.note,
-                    card.cardId,
-                    card.headerColor,
-                    card.barcodeType,
-                    card.starStatus);
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        cardCursor.close();
-
-        // Print an empty line
-        printer.println();
-
-        // Print the header for card group mappings
-        printer.printRecord(DBHelper.LoyaltyCardDbIdsGroups.cardID,
-                DBHelper.LoyaltyCardDbIdsGroups.groupID);
-
-        Cursor cardCursor2 = db.getLoyaltyCardCursor();
-
-        while(cardCursor2.moveToNext())
-        {
-            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor2);
-
-            for (Group group : db.getLoyaltyCardGroups(card.id)) {
-                printer.printRecord(card.id, group._id);
-            }
-
-            if(Thread.currentThread().isInterrupted())
-            {
-                throw new InterruptedException();
-            }
-        }
-
-        cardCursor2.close();
-
-        printer.close();
-    }
-}
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -4,47 +4,62 @@ 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 android.graphics.Color;

+import com.google.zxing.BarcodeFormat;
+
+import java.io.FileNotFoundException;
+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 = "Catima.db";
    public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 5;
+    public static final int DATABASE_VERSION = 10;

-    static class LoyaltyCardDbGroups
+    public static class LoyaltyCardDbGroups
    {
        public static final String TABLE = "groups";
        public static final String ID = "_id";
+        public static final String ORDER = "orderId";
    }

-    static class LoyaltyCardDbIds
+    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";
    }

-    static class LoyaltyCardDbIdsGroups
+    public static class LoyaltyCardDbIdsGroups
    {
        public static final String TABLE = "cardsGroups";
        public static final String cardID = "cardId";
        public static final String groupID = "groupId";
    }

+    private Context mContext;
+
    public DBHelper(Context context)
    {
        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+
+        mContext = context;
    }

    @Override
@@ -52,18 +67,23 @@ public class DBHelper extends SQLiteOpenHelper
    {
        // create table for card groups
        db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
-                LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
+                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.HEADER_TEXT_COLOR + " INTEGER," +
                LoyaltyCardDbIds.CARD_ID + " TEXT not null," +
-                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null," +
-                LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0' )");
+                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 + "(" +
@@ -109,55 +129,211 @@ public class DBHelper extends SQLiteOpenHelper
                    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 long insertLoyaltyCard(final String store, final String note, final String cardId,
-                                  final String barcodeType, final Integer headerColor,
+    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.HEADER_TEXT_COLOR, Color.WHITE);
        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
        return newId;
    }

-    public boolean insertLoyaltyCard(final SQLiteDatabase db, final int id, final String store,
-                                     final String note, final String cardId,
-                                     final String barcodeType, final Integer headerColor,
-                                     final int starStatus)
+    public long insertLoyaltyCard(final SQLiteDatabase db, final String store,
+                                     final String note, final Date expiry, final BigDecimal balance,
+                                     final Currency balanceType, final String cardId,
+                                     final String barcodeId, final BarcodeFormat barcodeType,
+                                     final Integer headerColor, final int starStatus)
+    {
+        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;
+    }
+
+    public long insertLoyaltyCard(final SQLiteDatabase db, final int id, final String store,
+                                     final String note, final Date expiry, final BigDecimal balance,
+                                     final Currency balanceType, final String cardId,
+                                     final String barcodeId, final BarcodeFormat barcodeType,
+                                     final Integer headerColor, final int starStatus)
    {
        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.HEADER_TEXT_COLOR, Color.WHITE);
        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
        final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
-        return (newId != -1);
+        return newId;
    }

    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);
-        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, Color.WHITE);
        int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
                LoyaltyCardDbIds.ID + "=?",
                new String[]{Integer.toString(id)});
@@ -206,6 +382,7 @@ public class DBHelper extends SQLiteOpenHelper
        List<Group> groups = new ArrayList<>();

        if (!data.moveToFirst()) {
+            data.close();
            return groups;
        }

@@ -215,6 +392,8 @@ public class DBHelper extends SQLiteOpenHelper
            groups.add(Group.toGroup(data));
        }

+        data.close();
+
        return groups;
    }

@@ -252,7 +431,7 @@ public class DBHelper extends SQLiteOpenHelper
        }
    }

-    public boolean deleteLoyaltyCard (final int id)
+    public boolean deleteLoyaltyCard(final int id)
    {
        SQLiteDatabase db = getWritableDatabase();
        // Delete card
@@ -265,6 +444,14 @@ public class DBHelper extends SQLiteOpenHelper
                LoyaltyCardDbIdsGroups.cardID + " = ? ",
                new String[]{String.format("%d", id)});

+        // Also wipe card images associated with this card
+        try {
+            Utils.saveCardImage(mContext, null, id, true);
+            Utils.saveCardImage(mContext, null, id, false);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
        return (rowsDeleted == 1);
    }

@@ -376,7 +563,7 @@ public class DBHelper extends SQLiteOpenHelper
        SQLiteDatabase db = getReadableDatabase();

        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
-                " ORDER BY " + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
+                " ORDER BY " + LoyaltyCardDbGroups.ORDER + " ASC," + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
        return res;
    }

@@ -386,6 +573,7 @@ public class DBHelper extends SQLiteOpenHelper
        List<Group> groups = new ArrayList<>();

        if (!data.moveToFirst()) {
+            data.close();
            return groups;
        }

@@ -395,9 +583,31 @@ public class DBHelper extends SQLiteOpenHelper
            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();
@@ -467,6 +677,7 @@ public class DBHelper extends SQLiteOpenHelper
        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;
    }
@@ -475,6 +686,7 @@ public class DBHelper extends SQLiteOpenHelper
    {
        ContentValues contentValues = new ContentValues();
        contentValues.put(LoyaltyCardDbGroups.ID, name);
+        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
        return (newId != -1);
    }
@@ -483,33 +695,66 @@ public class DBHelper extends SQLiteOpenHelper
    {
        if (newName.isEmpty()) return false;

+        boolean success = false;
+
        SQLiteDatabase db = getWritableDatabase();
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbGroups.ID, newName);
+        ContentValues groupContentValues = new ContentValues();
+        groupContentValues.put(LoyaltyCardDbGroups.ID, newName);
+
+        ContentValues lookupContentValues = new ContentValues();
+        lookupContentValues.put(LoyaltyCardDbIdsGroups.groupID, newName);
+
+        db.beginTransaction();
        try {
-            int rowsUpdated = db.update(LoyaltyCardDbGroups.TABLE, contentValues,
+            // Update group name
+            int groupsChanged = db.update(LoyaltyCardDbGroups.TABLE, groupContentValues,
                    LoyaltyCardDbGroups.ID + "=?",
                    new String[]{groupName});
-            return (rowsUpdated == 1);
-        } catch (android.database.sqlite.SQLiteConstraintException _e) {
-            return false;
+
+            // 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();
-        // Delete group
-        int rowsDeleted = 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});
+        db.beginTransaction();
+        try {
+            // Delete group
+            int groupsDeleted = db.delete(LoyaltyCardDbGroups.TABLE,
+                    LoyaltyCardDbGroups.ID + " = ? ",
+                    new String[]{groupName});

-        return (rowsDeleted == 1);
+            // 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)
--- a/app/src/main/java/protect/card_locker/DataFormat.java
+++ b/app/src/main/java/protect/card_locker/DataFormat.java
@@ -1,8 +0,0 @@
-package protect.card_locker;
-
-public enum DataFormat
-{
-    CSV,
-
-    ;
-}
--- a/app/src/main/java/protect/card_locker/DatabaseExporter.java
+++ b/app/src/main/java/protect/card_locker/DatabaseExporter.java
@@ -1,17 +0,0 @@
-package protect.card_locker;
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-
-/**
- * Interface for a class which can export the contents of the database
- * in a given format.
- */
-public interface DatabaseExporter
-{
-    /**
-     * Export the database to the output stream in a given format.
-     * @throws IOException
-     */
-    void exportData(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException;
-}
--- a/app/src/main/java/protect/card_locker/DatabaseImporter.java
+++ b/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;
-}
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -37,17 +37,20 @@ class GroupCursorAdapter extends CursorAdapter
    public void bindView(View view, Context context, Cursor cursor)
    {
        // Find fields to populate in inflated template
-        TextView nameField = (TextView) view.findViewById(R.id.name);
-        TextView countField = (TextView) view.findViewById(R.id.cardCount);
+        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(String.format(context.getString(R.string.groupCardCount), db.getGroupCardCount(group._id)));

-        nameField.setTextSize(settings.getCardTitleListFontSize());
-        countField.setTextSize(settings.getCardNoteListFontSize());
+        countField.setText(context.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
+
+        nameField.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+        countField.setTextSize(settings.getFontSizeMax(settings.getSmallFont()));
    }
 }
--- a/app/src/main/java/protect/card_locker/ImportExportActivity.java
+++ b/app/src/main/java/protect/card_locker/ImportExportActivity.java
@@ -2,26 +2,18 @@ package protect.card_locker;

 import android.Manifest;
 import android.content.ActivityNotFoundException;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
+import android.text.InputType;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.Toast;

 import java.io.File;
@@ -30,18 +22,32 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.List;

+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import protect.card_locker.importexport.DataFormat;
+import protect.card_locker.importexport.ImportExportResult;
+
 public class ImportExportActivity extends AppCompatActivity
 {
    private static final String TAG = "Catima";

    private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
    private static final int CHOOSE_EXPORT_LOCATION = 2;
-    private static final int CHOOSE_EXPORTED_FILE = 3;
+    private static final int IMPORT = 3;

    private ImportExportTask importExporter;

+    private String importAlertTitle;
+    private String importAlertMessage;
+    private DataFormat importDataFormat;
+
    @Override
    protected void onCreate(Bundle savedInstanceState)
    {
@@ -72,8 +78,8 @@ public class ImportExportActivity extends AppCompatActivity
        // Check that there is a file manager available
        final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
        intentCreateDocumentAction.addCategory(Intent.CATEGORY_OPENABLE);
-        intentCreateDocumentAction.setType("text/csv");
-        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "Catima.csv");
+        intentCreateDocumentAction.setType("application/zip");
+        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "catima.zip");

        Button exportButton = findViewById(R.id.exportButton);
        exportButton.setOnClickListener(new View.OnClickListener()
@@ -96,18 +102,10 @@ public class ImportExportActivity extends AppCompatActivity
            @Override
            public void onClick(View v)
            {
-                chooseFileWithIntent(intentGetContentAction, CHOOSE_EXPORTED_FILE);
+                chooseImportType(intentGetContentAction);
            }
        });

-        if(isCallable(getApplicationContext(), intentGetContentAction) == false)
-        {
-            findViewById(R.id.dividerImportFilesystem).setVisibility(View.GONE);
-            findViewById(R.id.importOptionFilesystemTitle).setVisibility(View.GONE);
-            findViewById(R.id.importOptionFilesystemExplanation).setVisibility(View.GONE);
-            importFilesystem.setVisibility(View.GONE);
-        }
-
        // Check that there is an app that data can be imported from
        final Intent intentPickAction = new Intent(Intent.ACTION_PICK);

@@ -117,32 +115,91 @@ public class ImportExportActivity extends AppCompatActivity
            @Override
            public void onClick(View v)
            {
-                chooseFileWithIntent(intentPickAction, CHOOSE_EXPORTED_FILE);
+                chooseImportType(intentPickAction);
            }
        });
-
-        if(isCallable(getApplicationContext(), intentPickAction) == false)
-        {
-            findViewById(R.id.dividerImportApplication).setVisibility(View.GONE);
-            findViewById(R.id.importOptionApplicationTitle).setVisibility(View.GONE);
-            findViewById(R.id.importOptionApplicationExplanation).setVisibility(View.GONE);
-            importApplication.setVisibility(View.GONE);
-        }
    }

-    private void startImport(final InputStream target, final Uri targetUri)
+    private void chooseImportType(Intent baseIntent) {
+        List<CharSequence> betaImportOptions = new ArrayList<>();
+        betaImportOptions.add("Fidme");
+        betaImportOptions.add("Stocard");
+        List<CharSequence> importOptions = new ArrayList<>();
+
+        for (String importOption : getResources().getStringArray(R.array.import_types_array)) {
+            if (betaImportOptions.contains(importOption)) {
+                importOption = importOption + " (BETA)";
+            }
+
+            importOptions.add(importOption);
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.chooseImportType)
+                .setItems(importOptions.toArray(new CharSequence[importOptions.size()]), (dialog, which) -> {
+                    switch (which) {
+                        // Catima
+                        case 0:
+                            importAlertTitle = getString(R.string.importCatima);
+                            importAlertMessage = getString(R.string.importCatimaMessage);
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Fidme
+                        case 1:
+                            importAlertTitle = getString(R.string.importFidme);
+                            importAlertMessage = getString(R.string.importFidmeMessage);
+                            importDataFormat = DataFormat.Fidme;
+                            break;
+                        // Loyalty Card Keychain
+                        case 2:
+                            importAlertTitle = getString(R.string.importLoyaltyCardKeychain);
+                            importAlertMessage = getString(R.string.importLoyaltyCardKeychainMessage);
+                            importDataFormat = DataFormat.Catima;
+                            break;
+                        // Stocard
+                        case 3:
+                            importAlertTitle = getString(R.string.importStocard);
+                            importAlertMessage = getString(R.string.importStocardMessage);
+                            importDataFormat = DataFormat.Stocard;
+                            break;
+                        // Voucher Vault
+                        case 4:
+                            importAlertTitle = getString(R.string.importVoucherVault);
+                            importAlertMessage = getString(R.string.importVoucherVaultMessage);
+                            importDataFormat = DataFormat.VoucherVault;
+                            break;
+                        default:
+                            throw new IllegalArgumentException("Unknown DataFormat");
+                    }
+
+                    new AlertDialog.Builder(this)
+                            .setTitle(importAlertTitle)
+                            .setMessage(importAlertMessage)
+                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                                        @Override
+                                        public void onClick(DialogInterface dialog, int which) {
+                                            chooseFileWithIntent(baseIntent, IMPORT);
+                                        }
+                                    })
+                            .setNegativeButton(R.string.cancel, null)
+                            .show();
+                });
+        builder.show();
+    }
+
+    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat, final char[] password)
    {
        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
        {
            @Override
-            public void onTaskComplete(boolean success)
+            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
            {
-                onImportComplete(success, targetUri);
+                onImportComplete(result, targetUri, dataFormat);
            }
        };

        importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.CSV, target, listener);
+                dataFormat, target, password, listener);
        importExporter.execute();
    }

@@ -151,14 +208,14 @@ public class ImportExportActivity extends AppCompatActivity
        ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
        {
            @Override
-            public void onTaskComplete(boolean success)
+            public void onTaskComplete(ImportExportResult result, DataFormat dataFormat)
            {
-                onExportComplete(success, targetUri);
+                onExportComplete(result, targetUri);
            }
        };

        importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.CSV, target, listener);
+                DataFormat.Catima, target, listener);
        importExporter.execute();
    }

@@ -178,7 +235,7 @@ public class ImportExportActivity extends AppCompatActivity
                }
            }

-            if(success == false)
+            if(!success)
            {
                // External storage permission rejected, inform user that
                // import/export is prevented
@@ -213,20 +270,43 @@ public class ImportExportActivity extends AppCompatActivity
        return super.onOptionsItemSelected(item);
    }

-    private void onImportComplete(boolean success, Uri path)
-    {
+    private void retryWithPassword(DataFormat dataFormat, Uri uri) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.passwordRequired);
+
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+        builder.setView(input);
+
+        builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> {
+            activityResultParser(IMPORT, RESULT_OK, uri, input.getText().toString().toCharArray());
+        });
+        builder.setNegativeButton(R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
+
+        builder.show();
+    }
+
+    private void onImportComplete(ImportExportResult result, Uri path, DataFormat dataFormat) {
+        if (result == ImportExportResult.BadPassword) {
+            retryWithPassword(dataFormat, path);
+            return;
+        }
+
        AlertDialog.Builder builder = new AlertDialog.Builder(this);

-        if(success)
+        int messageId;
+
+        if (result == ImportExportResult.Success)
        {
            builder.setTitle(R.string.importSuccessfulTitle);
+            messageId = R.string.importSuccessful;
        }
        else
        {
            builder.setTitle(R.string.importFailedTitle);
+            messageId = R.string.importFailed;
        }

-        int messageId = success ? R.string.importSuccessful : R.string.importFailed;
        final String message = getResources().getString(messageId);

        builder.setMessage(message);
@@ -242,84 +322,50 @@ public class ImportExportActivity extends AppCompatActivity
        builder.create().show();
    }

-    private void onExportComplete(boolean success, final Uri path)
+    private void onExportComplete(ImportExportResult result, final Uri path)
    {
        AlertDialog.Builder builder = new AlertDialog.Builder(this);

-        if(success)
+        int messageId;
+
+        if(result == ImportExportResult.Success)
        {
            builder.setTitle(R.string.exportSuccessfulTitle);
+            messageId = R.string.exportSuccessful;
        }
        else
        {
            builder.setTitle(R.string.exportFailedTitle);
+            messageId = R.string.exportFailed;
        }

-        int messageId = success ? R.string.exportSuccessful : R.string.exportFailed;
        final String message = getResources().getString(messageId);

        builder.setMessage(message);
-        builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
-        {
-            @Override
-            public void onClick(DialogInterface dialog, int which)
-            {
-                dialog.dismiss();
-            }
-        });
+        builder.setNeutralButton(R.string.ok, (dialog, which) -> dialog.dismiss());

-        if(success)
+        if(result == ImportExportResult.Success)
        {
            final CharSequence sendLabel = ImportExportActivity.this.getResources().getText(R.string.sendLabel);

-            builder.setPositiveButton(sendLabel, new DialogInterface.OnClickListener()
-            {
-                @Override
-                public void onClick(DialogInterface dialog, int which)
-                {
-                    Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                    sendIntent.putExtra(Intent.EXTRA_STREAM, path);
-                    sendIntent.setType("text/csv");
+            builder.setPositiveButton(sendLabel, (dialog, which) -> {
+                Intent sendIntent = new Intent(Intent.ACTION_SEND);
+                sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+                sendIntent.setType("text/csv");

-                    // set flag to give temporary permission to external app to use the FileProvider
-                    sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                // set flag to give temporary permission to external app to use the FileProvider
+                sendIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

-                    ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
-                            sendLabel));
+                ImportExportActivity.this.startActivity(Intent.createChooser(sendIntent,
+                        sendLabel));

-                    dialog.dismiss();
-                }
+                dialog.dismiss();
            });
        }

        builder.create().show();
    }

-    /**
-     * Determines if there is at least one activity that can perform the given intent
-     */
-    private boolean isCallable(Context context, final Intent intent)
-    {
-        PackageManager manager = context.getPackageManager();
-        if(manager == null)
-        {
-            return false;
-        }
-
-        List<ResolveInfo> list = manager.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
-
-        for(ResolveInfo info : list)
-        {
-            if(info.activityInfo.exported)
-            {
-                // There is one activity which is available to be called
-                return true;
-            }
-        }
-
-        return false;
-    }
-
    private void chooseFileWithIntent(Intent intent, int requestCode)
    {
        try
@@ -328,22 +374,18 @@ public class ImportExportActivity extends AppCompatActivity
        }
        catch (ActivityNotFoundException e)
        {
+            Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
            Log.e(TAG, "No activity found to handle intent", e);
        }
    }

-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (resultCode != RESULT_OK || (requestCode != CHOOSE_EXPORT_LOCATION && requestCode != CHOOSE_EXPORTED_FILE))
+    private void activityResultParser(int requestCode, int resultCode, Uri uri, char[] password) {
+        if (resultCode != RESULT_OK)
        {
            Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
            return;
        }

-        Uri uri = data.getData();
        if(uri == null)
        {
            Log.e(TAG, "Activity returned a NULL URI");
@@ -379,8 +421,9 @@ public class ImportExportActivity extends AppCompatActivity
                    reader = new FileInputStream(new File(uri.toString()));
                }

-                Log.e(TAG, "Starting file export with: " + uri.toString());
-                startImport(reader, uri);
+                Log.e(TAG, "Starting file import with: " + uri.toString());
+
+                startImport(reader, uri, importDataFormat, password);
            }
        }
        catch(FileNotFoundException e)
@@ -388,12 +431,26 @@ public class ImportExportActivity extends AppCompatActivity
            Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
            if (requestCode == CHOOSE_EXPORT_LOCATION)
            {
-                onExportComplete(false, uri);
+                onExportComplete(ImportExportResult.GenericFailure, uri);
            }
            else
            {
-                onImportComplete(false, uri);
+                onImportComplete(ImportExportResult.GenericFailure, uri, importDataFormat);
            }
        }
    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data)
+    {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if(data == null)
+        {
+            Log.e(TAG, "Activity returned NULL data");
+            return;
+        }
+
+        activityResultParser(requestCode, resultCode, data.getData(), null);
+    }
 }
--- a/app/src/main/java/protect/card_locker/ImportExportTask.java
+++ b/app/src/main/java/protect/card_locker/ImportExportTask.java
@@ -2,18 +2,24 @@ package protect.card_locker;

 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.util.Log;

 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;

-class ImportExportTask extends AsyncTask<Void, Void, Boolean>
+import protect.card_locker.importexport.DataFormat;
+import protect.card_locker.importexport.ImportExportResult;
+import protect.card_locker.importexport.MultiFormatExporter;
+import protect.card_locker.importexport.MultiFormatImporter;
+
+class ImportExportTask extends AsyncTask<Void, Void, ImportExportResult>
 {
    private static final String TAG = "Catima";

@@ -22,6 +28,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
    private DataFormat format;
    private OutputStream outputStream;
    private InputStream inputStream;
+    private char[] password;
    private TaskCompleteListener listener;

    private ProgressDialog progress;
@@ -43,7 +50,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
    /**
     * Constructor which will setup a task for importing from the given InputStream.
     */
-    ImportExportTask(Activity activity, DataFormat format, InputStream input,
+    ImportExportTask(Activity activity, DataFormat format, InputStream input, char[] password,
                            TaskCompleteListener listener)
    {
        super();
@@ -51,37 +58,27 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
        this.doImport = true;
        this.format = format;
        this.inputStream = input;
+        this.password = password;
        this.listener = listener;
    }

-    private boolean performImport(InputStream stream, DBHelper db)
+    private ImportExportResult performImport(Context context, InputStream stream, DBHelper db, char[] password)
    {
-        boolean result = false;
+        ImportExportResult importResult = MultiFormatImporter.importData(context, db, stream, format, password);

-        try
-        {
-            InputStreamReader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
-            result = MultiFormatImporter.importData(db, reader, format);
-            reader.close();
-        }
-        catch(IOException e)
-        {
-            Log.e(TAG, "Unable to import file", e);
-        }
+        Log.i(TAG, "Import result: " + importResult.name());

-        Log.i(TAG, "Import result: " + result);
-
-        return result;
+        return importResult;
    }

-    private boolean performExport(OutputStream stream, DBHelper db)
+    private ImportExportResult performExport(Context context, OutputStream stream, DBHelper db)
    {
-        boolean result = false;
+        ImportExportResult result = ImportExportResult.GenericFailure;

        try
        {
-            OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
-            result = MultiFormatExporter.exportData(db, writer, format);
+            OutputStreamWriter writer = new OutputStreamWriter(stream, StandardCharsets.UTF_8);
+            result = MultiFormatExporter.exportData(context, db, stream, format);
            writer.close();
        }
        catch (IOException e)
@@ -111,26 +108,26 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
        progress.show();
    }

-    protected Boolean doInBackground(Void... nothing)
+    protected ImportExportResult doInBackground(Void... nothing)
    {
        final DBHelper db = new DBHelper(activity);
-        boolean result;
+        ImportExportResult result;

        if(doImport)
        {
-            result = performImport(inputStream, db);
+            result = performImport(activity.getApplicationContext(), inputStream, db, password);
        }
        else
        {
-            result = performExport(outputStream, db);
+            result = performExport(activity.getApplicationContext(), outputStream, db);
        }

        return result;
    }

-    protected void onPostExecute(Boolean result)
+    protected void onPostExecute(ImportExportResult result)
    {
-        listener.onTaskComplete(result);
+        listener.onTaskComplete(result, format);

        progress.dismiss();
        Log.i(TAG, (doImport ? "Import" : "Export") + " Complete");
@@ -143,7 +140,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
    }
    interface TaskCompleteListener
    {
-        void onTaskComplete(boolean success);
+        void onTaskComplete(ImportExportResult result, DataFormat format);
    }

 }
--- a/app/src/main/java/protect/card_locker/ImportURIHelper.java
+++ b/app/src/main/java/protect/card_locker/ImportURIHelper.java
@@ -3,34 +3,57 @@ 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.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Currency;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;

 public class ImportURIHelper {
    private static final String STORE = DBHelper.LoyaltyCardDbIds.STORE;
    private static final String NOTE = DBHelper.LoyaltyCardDbIds.NOTE;
+    private static final String EXPIRY = DBHelper.LoyaltyCardDbIds.EXPIRY;
+    private static final String BALANCE = DBHelper.LoyaltyCardDbIds.BALANCE;
+    private static final String BALANCE_TYPE = DBHelper.LoyaltyCardDbIds.BALANCE_TYPE;
    private static final String CARD_ID = DBHelper.LoyaltyCardDbIds.CARD_ID;
+    private static final String BARCODE_ID = DBHelper.LoyaltyCardDbIds.BARCODE_ID;
    private static final String BARCODE_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
-
    private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;

    private final Context context;
-    private final String host;
-    private final String path;
-    private final String oldHost;
-    private final String oldPath;
+    private final String[] hosts = new String[3];
+    private final String[] paths = new String[3];
    private final String shareText;
+    private final String shareMultipleText;

    public ImportURIHelper(Context context) {
        this.context = context;
-        host = context.getResources().getString(R.string.intent_import_card_from_url_host);
-        path = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix);
-        oldHost = "brarcher.github.io";
-        oldPath = "/loyalty-card-locker/share";
+        hosts[0] = context.getResources().getString(R.string.intent_import_card_from_url_host_catima_app);
+        paths[0] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_catima_app);
+        hosts[1] = context.getResources().getString(R.string.intent_import_card_from_url_host_thelastproject);
+        paths[1] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_thelastproject);
+        hosts[2] = context.getResources().getString(R.string.intent_import_card_from_url_host_brarcher);
+        paths[2] = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix_brarcher);
        shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
+        shareMultipleText = context.getResources().getString(R.string.intent_import_card_from_url_share_multiple_text);
    }

    private boolean isImportUri(Uri uri) {
-        return (uri.getHost().equals(host) && uri.getPath().equals(path)) || (uri.getHost().equals(oldHost) && uri.getPath().equals(oldPath));
+        for (int i = 0; i < hosts.length; i++) {
+            if (uri.getHost().equals(hosts[i]) && uri.getPath().equals(paths[i])) {
+                return true;
+            }
+        }
+
+        return false;
    }

    public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
@@ -40,56 +63,146 @@ public class ImportURIHelper {

        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;
-            Integer headerTextColor = null;

-            String store = uri.getQueryParameter(STORE);
-            String note = uri.getQueryParameter(NOTE);
-            String cardId = uri.getQueryParameter(CARD_ID);
-            String barcodeType = uri.getQueryParameter(BARCODE_TYPE);
-            if (store == null || note == null || cardId == null || barcodeType == null) throw new InvalidObjectException("Not a valid import URI");
+            // Store everything in a simple key/value hashmap
+            HashMap<String, String> kv = new HashMap<>();

-            String unparsedHeaderColor = uri.getQueryParameter(HEADER_COLOR);
+            // First, grab all query parameters (backwards compatibility)
+            for (String key : uri.getQueryParameterNames()) {
+                kv.put(key, uri.getQueryParameter(key));
+            }
+
+            // Then, parse the new and more private fragment part
+            // Overriding old format entries if they exist
+            String fragment = uri.getFragment();
+            if (fragment != null) {
+                for (String fragmentPart : fragment.split("&")) {
+                    String[] fragmentData = fragmentPart.split("=", 2);
+                    kv.put(fragmentData[0], URLDecoder.decode(fragmentData[1], StandardCharsets.UTF_8.name()));
+                }
+            }
+
+            // Then use all values we care about
+            String store = kv.get(STORE);
+            String note = kv.get(NOTE);
+            String cardId = kv.get(CARD_ID);
+            String barcodeId = kv.get(BARCODE_ID);
+            if (store == null || note == null || cardId == null) throw new InvalidObjectException("Not a valid import URI: " + uri.toString());
+
+            String unparsedBarcodeType = kv.get(BARCODE_TYPE);
+            if(unparsedBarcodeType != null && !unparsedBarcodeType.equals(""))
+            {
+                barcodeType = BarcodeFormat.valueOf(unparsedBarcodeType);
+            }
+
+            String unparsedBalance = kv.get(BALANCE);
+            if(unparsedBalance != null && !unparsedBalance.equals(""))
+            {
+                balance = new BigDecimal(unparsedBalance);
+            }
+            String unparsedBalanceType = kv.get(BALANCE_TYPE);
+            if (unparsedBalanceType != null && !unparsedBalanceType.equals(""))
+            {
+                balanceType = Currency.getInstance(unparsedBalanceType);
+            }
+            String unparsedExpiry = kv.get(EXPIRY);
+            if(unparsedExpiry != null && !unparsedExpiry.equals(""))
+            {
+                expiry = new Date(Long.parseLong(unparsedExpiry));
+            }
+
+            String unparsedHeaderColor = kv.get(HEADER_COLOR);
            if(unparsedHeaderColor != null)
            {
                headerColor = Integer.parseInt(unparsedHeaderColor);
            }

-            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor, 0);
-        } catch (NullPointerException | NumberFormatException ex) {
+            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, 0);
+        } catch (NullPointerException | NumberFormatException | UnsupportedEncodingException ex) {
            throw new InvalidObjectException("Not a valid import URI");
        }
    }

+    private StringBuilder appendFragment(StringBuilder fragment, String key, String value) throws UnsupportedEncodingException {
+        if (fragment.length() > 0) {
+            fragment.append("&");
+        }
+
+        // Double-encode the value to make sure it can't accidentally contain symbols that'll break the parser
+        fragment.append(key).append("=").append(URLEncoder.encode(value, StandardCharsets.UTF_8.name()));
+
+        return fragment;
+    }
+
    // Protected for usage in tests
-    protected Uri toUri(LoyaltyCard loyaltyCard) {
+    protected Uri toUri(LoyaltyCard loyaltyCard) throws UnsupportedEncodingException {
        Uri.Builder uriBuilder = new Uri.Builder();
        uriBuilder.scheme("https");
-        uriBuilder.authority(host);
-        uriBuilder.path(path);
-        uriBuilder.appendQueryParameter(STORE, loyaltyCard.store);
-        uriBuilder.appendQueryParameter(NOTE, loyaltyCard.note);
-        uriBuilder.appendQueryParameter(CARD_ID, loyaltyCard.cardId);
-        uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType);
-        if(loyaltyCard.headerColor != null)
-        {
-            uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
+        uriBuilder.authority(hosts[0]);
+        uriBuilder.path(paths[0]);
+
+        // Use fragment instead of QueryParameter to not leak this data to the server
+        StringBuilder fragment = new StringBuilder();
+
+        fragment = appendFragment(fragment, STORE, loyaltyCard.store);
+        fragment = appendFragment(fragment, NOTE, loyaltyCard.note);
+        fragment = appendFragment(fragment, BALANCE, loyaltyCard.balance.toString());
+        if (loyaltyCard.balanceType != null) {
+            fragment = appendFragment(fragment, BALANCE_TYPE, loyaltyCard.balanceType.getCurrencyCode());
        }
-        //StarStatus will not be exported
+        if (loyaltyCard.expiry != null) {
+            fragment = appendFragment(fragment, EXPIRY, String.valueOf(loyaltyCard.expiry.getTime()));
+        }
+        fragment = appendFragment(fragment, CARD_ID, loyaltyCard.cardId);
+        if(loyaltyCard.barcodeId != null) {
+            fragment = appendFragment(fragment, BARCODE_ID, loyaltyCard.barcodeId);
+        }
+
+        if(loyaltyCard.barcodeType != null) {
+            fragment = appendFragment(fragment, BARCODE_TYPE, loyaltyCard.barcodeType.toString());
+        }
+        if(loyaltyCard.headerColor != null) {
+            fragment = appendFragment(fragment, HEADER_COLOR, loyaltyCard.headerColor.toString());
+        }
+        // Star status will not be exported
+        // Front and back pictures are often too big to fit into a message in base64 nicely, not sharing either...
+
+        uriBuilder.fragment(fragment.toString());
        return uriBuilder.build();
    }

-    private void startShareIntent(Uri uri) {
+    public void startShareIntent(List<LoyaltyCard> loyaltyCards) throws UnsupportedEncodingException {
+        int loyaltyCardCount = loyaltyCards.size();
+
+        StringBuilder text = new StringBuilder();
+        if (loyaltyCardCount == 1) {
+            text.append(shareText);
+        } else {
+            text.append(shareMultipleText);
+        }
+        text.append("\n\n");
+
+        for (int i = 0; i < loyaltyCardCount; i++) {
+            LoyaltyCard loyaltyCard = loyaltyCards.get(i);
+
+            text.append(loyaltyCard.store + ": " + toUri(loyaltyCard));
+
+            if (i < (loyaltyCardCount - 1)) {
+                text.append("\n\n");
+            }
+        }
+
        Intent sendIntent = new Intent();
        sendIntent.setAction(Intent.ACTION_SEND);
-        sendIntent.putExtra(Intent.EXTRA_TEXT, shareText + "\n" + uri.toString());
+        sendIntent.putExtra(Intent.EXTRA_TEXT, text.toString());
        sendIntent.setType("text/plain");

        Intent shareIntent = Intent.createChooser(sendIntent, null);
        context.startActivity(shareIntent);
    }
-
-    public void startShareIntent(LoyaltyCard loyaltyCard) {
-        startShareIntent(toUri(loyaltyCard));
-    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -2,35 +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 java.util.HashMap;
+import java.util.Map;
+
 import androidx.annotation.Nullable;

-public class LoyaltyCard
-{
+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;
+
+    @Nullable
+    public final String barcodeId;
+
+    public final BarcodeFormat barcodeType;

    @Nullable
    public final Integer headerColor;

-    @Nullable
-    public final Integer headerTextColor;
-
    public final int starStatus;

-    public LoyaltyCard(final int id, final String store, final String note, final String cardId,
-                       final String barcodeType, final Integer headerColor, final Integer headerTextColor,
+    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.headerTextColor = headerTextColor;
        this.starStatus = starStatus;
    }

@@ -39,27 +54,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));

-
+        int barcodeTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
+        int balanceTypeColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE);
        int headerColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR);
-        int headerTextColorColumn = cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR);

+        BarcodeFormat barcodeType = null;
+        Currency balanceType = null;
+        Date expiry = null;
        Integer headerColor = null;
-        Integer headerTextColor = 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);
        }

-        if(cursor.isNull(headerTextColorColumn) == false)
-        {
-            headerTextColor = cursor.getInt(headerTextColorColumn);
-        }
-
-        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor, starred);
+        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starred);
    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardAnimator.java
+++ b/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();
+        }
+    }
+
+}
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -4,73 +4,294 @@ 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;
+
+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;

-class LoyaltyCardCursorAdapter extends CursorAdapter
+public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder>
 {
-    Settings settings;
-    boolean darkModeEnabled;
+    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 context, Cursor cursor)
+    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener)
    {
-        super(context, cursor, 0);
-        settings = new Settings(context);
-        darkModeEnabled= MainActivity.isDarkModeEnabled(context);
+        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
-        ImageView thumbnail = view.findViewById(R.id.thumbnail);
-        TextView storeField = view.findViewById(R.id.store);
-        TextView noteField = view.findViewById(R.id.note);
-        ImageView star = view.findViewById(R.id.star);
+        return mCursor;
+    }

-        if(darkModeEnabled)
-        {
-            star.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
+    public void onBindViewHolder(LoyaltyCardListItemViewHolder inputHolder, Cursor inputCursor) {
+        if (mDarkModeEnabled) {
+            inputHolder.mStarIcon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
        }

-        // Extract properties from cursor
-        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
+        LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(inputCursor);

-        // Populate fields with extracted properties
-        storeField.setText(loyaltyCard.store);
+        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);
+        }

-        storeField.setTextSize(settings.getCardTitleListFontSize());
+        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.note.isEmpty())
+        if (loyaltyCard.expiry != null)
        {
-            noteField.setVisibility(View.VISIBLE);
-            noteField.setText(loyaltyCard.note);
-            noteField.setTextSize(settings.getCardNoteListFontSize());
+            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());
+
+    }
+
+    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
        {
-            noteField.setVisibility(View.GONE);
+            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));
        }

-        if (loyaltyCard.starStatus!=0) star.setVisibility(View.VISIBLE);
-            else star.setVisibility(View.GONE);
-
-        thumbnail.setImageBitmap(Utils.generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+        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;
+        }
+    }
+}
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
--- a/app/src/main/java/protect/card_locker/LoyaltyCardField.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardField.java
@@ -0,0 +1,15 @@
+package protect.card_locker;
+
+public enum LoyaltyCardField {
+    id,
+    store,
+    note,
+    expiry,
+    balance,
+    balanceType,
+    cardId,
+    barcodeId,
+    barcodeType,
+    headerColor,
+    starStatus
+}
--- a/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardLockerApplication.java
@@ -1,8 +1,8 @@
 package protect.card_locker;

 import android.app.Application;
-import androidx.appcompat.app.AppCompatDelegate;

+import androidx.appcompat.app.AppCompatDelegate;
 import protect.card_locker.preferences.Settings;

 public class LoyaltyCardLockerApplication extends Application {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -2,34 +2,47 @@ package protect.card_locker;

 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
-
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.widget.TextViewCompat;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.widget.Toolbar;
+import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;

+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.zxing.BarcodeFormat;

+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.util.Arrays;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.Guideline;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.TextViewCompat;
 import protect.card_locker.preferences.Settings;

 public class LoyaltyCardViewActivity extends AppCompatActivity
@@ -37,11 +50,24 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
    private static final String TAG = "Catima";

    TextView cardIdFieldView;
+    BottomSheetBehavior behavior;
+    View bottomSheet;
+    View bottomSheetContentWrapper;
+    ImageView bottomSheetButton;
+    View frontImageView;
+    ImageView frontImage;
+    View backImageView;
+    ImageView backImage;
    TextView noteView;
-    View noteViewDivider;
+    TextView groupsView;
+    TextView balanceView;
+    TextView expiryView;
    TextView storeName;
+    ImageButton maximizeButton;
    ImageView barcodeImage;
+    ImageButton minimizeButton;
    View collapsingToolbarLayout;
+    AppBarLayout appBarLayout;
    int loyaltyCardId;
    LoyaltyCard loyaltyCard;
    boolean rotationEnabled;
@@ -50,12 +76,28 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
    Settings settings;

    String cardIdString;
+    String barcodeIdString;
    BarcodeFormat format;

+    FloatingActionButton editButton;
+
+    Guideline centerGuideline;
+    SeekBar barcodeScaler;
+
+    Bitmap frontImageBitmap;
+    Bitmap backImageBitmap;
+
    boolean starred;
    boolean backgroundNeedsDarkIcons;
-    boolean barcodeIsFullscreen = false;
-    ViewGroup.LayoutParams barcodeImageState;
+    FullscreenType fullscreenType = FullscreenType.NONE;
+    boolean isBarcodeSupported = true;
+
+    enum FullscreenType {
+        NONE,
+        BARCODE,
+        IMAGE_FRONT,
+        IMAGE_BACK
+    }

    private void extractIntentFields(Intent intent)
    {
@@ -67,6 +109,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
    private Drawable getIcon(int icon, boolean dark)
    {
        Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
+        assert unwrappedIcon != null;
        Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
        if(dark)
        {
@@ -91,39 +134,145 @@ public class LoyaltyCardViewActivity extends AppCompatActivity

        setContentView(R.layout.loyalty_card_view_layout);

-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
        db = new DBHelper(this);
        importURIHelper = new ImportURIHelper(this);

        cardIdFieldView = findViewById(R.id.cardIdView);
+        bottomSheet = findViewById(R.id.bottom_sheet);
+        bottomSheetContentWrapper = findViewById(R.id.bottomSheetContentWrapper);
+        bottomSheetButton = findViewById(R.id.bottomSheetButton);
+        frontImageView = findViewById(R.id.frontImageView);
+        frontImage = findViewById(R.id.frontImage);
+        backImageView = findViewById(R.id.backImageView);
+        backImage = findViewById(R.id.backImage);
        noteView = findViewById(R.id.noteView);
-        noteViewDivider = findViewById(R.id.noteViewDivider);
+        groupsView = findViewById(R.id.groupsView);
+        balanceView = findViewById(R.id.balanceView);
+        expiryView = findViewById(R.id.expiryView);
        storeName = findViewById(R.id.storeName);
+        maximizeButton = findViewById(R.id.maximizeButton);
        barcodeImage = findViewById(R.id.barcode);
+        minimizeButton = findViewById(R.id.minimizeButton);
        collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
+        appBarLayout = findViewById(R.id.app_bar_layout);
+
+        centerGuideline = findViewById(R.id.centerGuideline);
+        centerGuideline.setGuidelinePercent(0.5f);
+        barcodeScaler = findViewById(R.id.barcodeScaler);
+        barcodeScaler.setProgress(100);
+        barcodeScaler.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                Log.d(TAG, "Progress is " + progress);
+                Log.d(TAG, "Max is " + barcodeScaler.getMax());
+                float scale = (float) progress / (float) barcodeScaler.getMax();
+                Log.d(TAG, "Scaling to " + scale);
+
+                if (fullscreenType == FullscreenType.BARCODE) {
+                    redrawBarcodeAfterResize();
+                }
+                centerGuideline.setGuidelinePercent(0.5f * scale);
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+
+            }
+        });

        rotationEnabled = true;

        // Allow making barcode fullscreen on tap
-        barcodeImage.setOnClickListener(new View.OnClickListener() {
+        maximizeButton.setOnClickListener(v -> setFullscreen(FullscreenType.BARCODE));
+        barcodeImage.setOnClickListener(view -> {
+            if (fullscreenType != FullscreenType.NONE) {
+                setFullscreen(FullscreenType.NONE);
+            } else {
+                setFullscreen(FullscreenType.BARCODE);
+            }
+        });
+        frontImageView.setOnClickListener(view -> {
+            if (fullscreenType != FullscreenType.IMAGE_FRONT) {
+                setFullscreen(FullscreenType.IMAGE_FRONT);
+            } else {
+                setFullscreen(FullscreenType.NONE);
+            }
+        });
+        backImageView.setOnClickListener(view -> {
+            if (fullscreenType != FullscreenType.IMAGE_BACK) {
+                setFullscreen(FullscreenType.IMAGE_BACK);
+            } else {
+                setFullscreen(FullscreenType.NONE);
+            }
+        });
+        minimizeButton.setOnClickListener(v -> setFullscreen(FullscreenType.NONE));
+
+        editButton = findViewById(R.id.fabEdit);
+        editButton.setOnClickListener(v -> {
+            Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putInt("id", loyaltyCardId);
+            bundle.putBoolean("update", true);
+            intent.putExtras(bundle);
+            startActivity(intent);
+            finish();
+        });
+        editButton.bringToFront();
+
+        behavior = BottomSheetBehavior.from(bottomSheet);
+        behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
            @Override
-            public void onClick(View view) {
-                if(barcodeIsFullscreen)
-                {
-                    setFullscreen(false);
-                }
-                else
-                {
-                    setFullscreen(true);
+            public void onStateChanged(@NonNull View bottomSheet, int newState) {
+                if (newState == BottomSheetBehavior.STATE_DRAGGING) {
+                    editButton.hide();
+                } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
+                    bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_down_24);
+                    editButton.hide();
+                } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
+                    bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
+                    if (fullscreenType == FullscreenType.NONE) {
+                        editButton.show();
+                    }
+
+                    // Scroll bottomsheet content back to top
+                    bottomSheetContentWrapper.setScrollY(0);
                }
            }
+
+            @Override
+            public void onSlide(@NonNull View bottomSheet, float slideOffset) { }
+        });
+
+        bottomSheetButton.setOnClickListener(v -> {
+            if (behavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
+                behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+            } else {
+                behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+            }
+        });
+
+        // Fix bottom sheet content sizing
+        ViewTreeObserver viewTreeObserver = bottomSheet.getViewTreeObserver();
+        viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                bottomSheet.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
+                int height = displayMetrics.heightPixels;
+                int maxHeight = height - appBarLayout.getHeight() - bottomSheetButton.getHeight();
+                Log.d(TAG, "Button sheet should be " + maxHeight + " pixels high");
+                bottomSheetContentWrapper.setLayoutParams(
+                        new LinearLayout.LayoutParams(
+                                LinearLayout.LayoutParams.MATCH_PARENT,
+                                maxHeight
+                        )
+                );
+            }
        });
    }

@@ -143,23 +292,28 @@ public class LoyaltyCardViewActivity extends AppCompatActivity

        Log.i(TAG, "To view card: " + loyaltyCardId);

-        if(barcodeIsFullscreen)
-        {
-            // Completely reset state
-            //
-            // This prevents the barcode from taking up the entire screen
-            // on resume and thus being stretched out of proportion.
-            recreate();
-        }
-
        // The brightness value is on a scale from [0, ..., 1], where
        // '1' is the brightest. We attempt to maximize the brightness
        // to help barcode readers scan the barcode.
        Window window = getWindow();
-        if(window != null && settings.useMaxBrightnessDisplayingBarcode())
+        if(window != null)
        {
            WindowManager.LayoutParams attributes = window.getAttributes();
-            attributes.screenBrightness = 1F;
+
+            if (settings.useMaxBrightnessDisplayingBarcode())
+            {
+                attributes.screenBrightness = 1F;
+            }
+
+            if (settings.getKeepScreenOn()) {
+                window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+            }
+
+            if (settings.getDisableLockscreenWhileViewingCard()) {
+                window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD|
+                        WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+            }
+
            window.setAttributes(attributes);
        }

@@ -172,30 +326,95 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
            return;
        }

-        String formatString = loyaltyCard.barcodeType;
-        format = !formatString.isEmpty() ? BarcodeFormat.valueOf(formatString) : null;
+        setupOrientation();
+
+        format = loyaltyCard.barcodeType;
        cardIdString = loyaltyCard.cardId;
+        barcodeIdString = loyaltyCard.barcodeId;

        cardIdFieldView.setText(loyaltyCard.cardId);
        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(cardIdFieldView,
-                getResources().getInteger(R.integer.settings_card_id_min_font_size_sp)-1, settings.getCardIdFontSize(),
+                settings.getFontSizeMin(settings.getLargeFont()), settings.getFontSizeMax(settings.getLargeFont()),
                1, TypedValue.COMPLEX_UNIT_SP);

+        frontImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, true);
+        if (frontImageBitmap != null) {
+            frontImageView.setVisibility(View.VISIBLE);
+            frontImage.setImageBitmap(frontImageBitmap);
+        } else {
+            frontImageView.setVisibility(View.GONE);
+        }
+
+        backImageBitmap = Utils.retrieveCardImage(this, loyaltyCard.id, false);
+        if (backImageBitmap != null) {
+            backImageView.setVisibility(View.VISIBLE);
+            backImage.setImageBitmap(backImageBitmap);
+        } else {
+            backImageView.setVisibility(View.GONE);
+        }
+
        if(loyaltyCard.note.length() > 0)
        {
+            noteView.setVisibility(View.VISIBLE);
            noteView.setText(loyaltyCard.note);
-            TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(noteView,
-                    getResources().getInteger(R.integer.settings_card_note_min_font_size_sp)-1,
-                    settings.getCardNoteFontSize(), 1, TypedValue.COMPLEX_UNIT_SP);
+            noteView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
        }
        else
        {
            noteView.setVisibility(View.GONE);
-            noteViewDivider.setVisibility(View.GONE);
+        }
+
+        List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
+
+        if(loyaltyCardGroups.size() > 0) {
+            StringBuilder groupsString = new StringBuilder();
+            for (Group group : loyaltyCardGroups) {
+                groupsString.append(group._id);
+                groupsString.append(" ");
+            }
+
+            groupsView.setVisibility(View.VISIBLE);
+            groupsView.setText(getString(R.string.groupsList, groupsString.toString()));
+            groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+        }
+        else
+        {
+            groupsView.setVisibility(View.GONE);
+        }
+
+        if(!loyaltyCard.balance.equals(new BigDecimal(0))) {
+            balanceView.setVisibility(View.VISIBLE);
+            balanceView.setText(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
+            balanceView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+        }
+        else
+        {
+            balanceView.setVisibility(View.GONE);
+        }
+
+        if(loyaltyCard.expiry != null) {
+            expiryView.setVisibility(View.VISIBLE);
+
+            int expiryString = R.string.expiryStateSentence;
+            if(Utils.hasExpired(loyaltyCard.expiry)) {
+                expiryString = R.string.expiryStateSentenceExpired;
+                expiryView.setTextColor(getResources().getColor(R.color.alert));
+            }
+            expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
+            expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+        }
+        else
+        {
+            expiryView.setVisibility(View.GONE);
+        }
+        expiryView.setTag(loyaltyCard.expiry);
+
+        if (fullscreenType == FullscreenType.NONE) {
+            makeBottomSheetVisibleIfUseful();
        }

        storeName.setText(loyaltyCard.store);
-        storeName.setTextSize(settings.getCardTitleFontSize());
+        storeName.setTextSize(settings.getFontSizeMax(settings.getLargeFont()));

        int backgroundHeaderColor;
        if(loyaltyCard.headerColor != null)
@@ -208,6 +427,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
        }

        collapsingToolbarLayout.setBackgroundColor(backgroundHeaderColor);
+        appBarLayout.setBackgroundColor(backgroundHeaderColor);

        int textColor;
        if(Utils.needsDarkForeground(backgroundHeaderColor))
@@ -219,6 +439,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
            textColor = Color.WHITE;
        }
        storeName.setTextColor(textColor);
+        ((Toolbar) findViewById(R.id.toolbar_landscape)).setTitleTextColor(textColor);

        // If the background is very bright, we should use dark icons
        backgroundNeedsDarkIcons = Utils.needsDarkForeground(backgroundHeaderColor);
@@ -241,63 +462,57 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
        // Set shadow colour of store text so even same color on same color would be readable
        storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE);

-        if(format != null)
+        if (format != null && !BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES.contains(format.name())) {
+            isBarcodeSupported = false;
+
+            Toast.makeText(this, getString(R.string.unsupportedBarcodeType), Toast.LENGTH_LONG).show();
+        }
+
+        if(format != null && isBarcodeSupported)
        {
-            findViewById(R.id.barcode).setVisibility(View.VISIBLE);
+            if (fullscreenType == FullscreenType.NONE) {
+                maximizeButton.setVisibility(View.VISIBLE);
+            }
+            barcodeImage.setVisibility(View.VISIBLE);
            if(barcodeImage.getHeight() == 0)
            {
                Log.d(TAG, "ImageView size is not known known at start, waiting for load");
                // The size of the ImageView is not yet available as it has not
                // yet been drawn. Wait for it to be drawn so the size is available.
-                barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
-                        new ViewTreeObserver.OnGlobalLayoutListener()
-                        {
-                            @Override
-                            public void onGlobalLayout()
-                            {
-                                barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
-                                Log.d(TAG, "ImageView size now known");
-                                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
-                            }
-                        });
+                redrawBarcodeAfterResize();
            }
            else
            {
                Log.d(TAG, "ImageView size known known, creating barcode");
-                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
+                new BarcodeImageWriterTask(
+                    barcodeImage,
+                    barcodeIdString != null ? barcodeIdString : cardIdString,
+                    format,
+                    null,
+                    false,
+                    null)
+                .execute();
            }
+
+            // Force redraw fullscreen state
+            setFullscreen(fullscreenType);
        }
        else
        {
-            findViewById(R.id.barcode).setVisibility(View.GONE);
+            maximizeButton.setVisibility(View.GONE);
+            barcodeImage.setVisibility(View.GONE);
        }
-
-        FloatingActionButton editButton = findViewById(R.id.fabEdit);
-        editButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = new Bundle();
-                bundle.putInt("id", loyaltyCardId);
-                bundle.putBoolean("update", true);
-                intent.putExtras(bundle);
-                startActivity(intent);
-                finish();
-            }
-        });
    }

    @Override
    public void onBackPressed() {
-        if (barcodeIsFullscreen)
+        if (fullscreenType != FullscreenType.NONE)
        {
-            setFullscreen(false);
+            setFullscreen(FullscreenType.NONE);
            return;
        }

        super.onBackPressed();
-        return;
    }

    @Override
@@ -349,7 +564,12 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                break;

            case R.id.action_share:
-                importURIHelper.startShareIntent(loyaltyCard);
+                try {
+                    importURIHelper.startShareIntent(Arrays.asList(loyaltyCard));
+                } catch (UnsupportedEncodingException e) {
+                    Toast.makeText(LoyaltyCardViewActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
+                    e.printStackTrace();
+                }
                return true;

            case R.id.action_lock_unlock:
@@ -374,7 +594,40 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
        return super.onOptionsItemSelected(item);
    }

+    private void setupOrientation()
+    {
+        Toolbar portraitToolbar = findViewById(R.id.toolbar);
+        Toolbar landscapeToolbar = findViewById(R.id.toolbar_landscape);

+        int orientation = getResources().getConfiguration().orientation;
+        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            Log.d(TAG, "Detected landscape mode");
+
+            setTitle(loyaltyCard.store);
+
+            collapsingToolbarLayout.setVisibility(View.GONE);
+            portraitToolbar.setVisibility(View.GONE);
+            landscapeToolbar.setVisibility(View.VISIBLE);
+
+            setSupportActionBar(landscapeToolbar);
+        } else {
+            Log.d(TAG, "Detected portrait mode");
+
+            setTitle("");
+
+            collapsingToolbarLayout.setVisibility(View.VISIBLE);
+            portraitToolbar.setVisibility(View.VISIBLE);
+            landscapeToolbar.setVisibility(View.GONE);
+
+            setSupportActionBar(portraitToolbar);
+        }
+
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+        {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+    }
    private void setOrientatonLock(MenuItem item, boolean lock)
    {
        if(lock)
@@ -392,19 +645,67 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
        }
    }

+    private void makeBottomSheetVisibleIfUseful()
+    {
+        if (frontImageView.getVisibility() == View.VISIBLE || backImageView.getVisibility() == View.VISIBLE || noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || balanceView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
+            bottomSheet.setVisibility(View.VISIBLE);
+        }
+        else
+        {
+            bottomSheet.setVisibility(View.GONE);
+        }
+    }
+
+    private void redrawBarcodeAfterResize()
+    {
+        if (format != null) {
+            barcodeImage.getViewTreeObserver().addOnGlobalLayoutListener(
+                    new ViewTreeObserver.OnGlobalLayoutListener() {
+                        @Override
+                        public void onGlobalLayout() {
+                            barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+
+                            Log.d(TAG, "ImageView size now known");
+                            new BarcodeImageWriterTask(
+                                barcodeImage,
+                                barcodeIdString != null ? barcodeIdString : cardIdString,
+                                format,
+                                null,
+                                false,
+                                null)
+                            .execute();
+                        }
+                    });
+        };
+    }
+
    /**
     * When enabled, hides the status bar and moves the barcode to the top of the screen.
     *
     * The purpose of this function is to make sure the barcode can be scanned from the phone
     * by machines which offer no space to insert the complete device.
     */
-    private void setFullscreen(boolean enable)
+    private void setFullscreen(FullscreenType fullscreenType)
    {
        ActionBar actionBar = getSupportActionBar();
-        if(enable && !barcodeIsFullscreen)
-        {
-            // Save previous barcodeImage state
-            barcodeImageState = barcodeImage.getLayoutParams();
+        if (fullscreenType != FullscreenType.NONE) {
+            Log.d(TAG, "Move into fullscreen");
+
+            if (fullscreenType == FullscreenType.IMAGE_FRONT) {
+                barcodeImage.setImageBitmap(frontImageBitmap);
+                barcodeImage.setVisibility(View.VISIBLE);
+            } else if (fullscreenType == FullscreenType.IMAGE_BACK) {
+                barcodeImage.setImageBitmap(backImageBitmap);
+                barcodeImage.setVisibility(View.VISIBLE);
+            } else {
+                // Prepare redraw after size change
+                redrawBarcodeAfterResize();
+            }
+
+            // Hide maximize and show minimize button and scaler
+            maximizeButton.setVisibility(View.GONE);
+            minimizeButton.setVisibility(View.VISIBLE);
+            barcodeScaler.setVisibility(View.VISIBLE);

            // Hide actionbar
            if(actionBar != null)
@@ -412,57 +713,75 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                actionBar.hide();
            }

-            // Hide collapsingToolbar
+            // Hide toolbars
+            //
+            // Appbar needs to be invisible and have padding removed
+            // Or the barcode will be centered instead of on top of the screen
+            // Don't ask me why...
+            appBarLayout.setVisibility(View.INVISIBLE);
            collapsingToolbarLayout.setVisibility(View.GONE);
+            findViewById(R.id.toolbar_landscape).setVisibility(View.GONE);
+
+            // Hide other UI elements
+            cardIdFieldView.setVisibility(View.GONE);
+            bottomSheet.setVisibility(View.GONE);
+            behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
+            editButton.hide();

            // Set Android to fullscreen mode
            getWindow().getDecorView().setSystemUiVisibility(
-                getWindow().getDecorView().getSystemUiVisibility()
-                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                | View.SYSTEM_UI_FLAG_FULLSCREEN
+                    getWindow().getDecorView().getSystemUiVisibility()
+                            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                            | View.SYSTEM_UI_FLAG_FULLSCREEN
            );
-
-            // Make barcode take all space
-            barcodeImage.setLayoutParams(new ConstraintLayout.LayoutParams(
-                ConstraintLayout.LayoutParams.MATCH_PARENT,
-                ConstraintLayout.LayoutParams.MATCH_PARENT
-            ));
-
-            // Move barcode to top
-            barcodeImage.setScaleType(ImageView.ScaleType.FIT_START);
-
-            // Prevent centering
-            barcodeImage.setAdjustViewBounds(false);
-
-            // Set current state
-            barcodeIsFullscreen = true;
        }
-        else if(!enable && barcodeIsFullscreen)
+        else
        {
+            Log.d(TAG, "Move out of fullscreen");
+
+            // Reset center guideline
+            barcodeScaler.setProgress(100);
+
+            // Prepare redraw after size change
+            if (format != null && isBarcodeSupported) {
+                redrawBarcodeAfterResize();
+            } else {
+                barcodeImage.setVisibility(View.GONE);
+            }
+
+            // Show maximize and hide minimize button and scaler
+            if (format != null && isBarcodeSupported) {
+                maximizeButton.setVisibility(View.VISIBLE);
+            }
+            minimizeButton.setVisibility(View.GONE);
+            barcodeScaler.setVisibility(View.GONE);
+
            // Show actionbar
            if(actionBar != null)
            {
                actionBar.show();
            }

-            // Show collapsingToolbar
-            collapsingToolbarLayout.setVisibility(View.VISIBLE);
+            // Show appropriate toolbar
+            // And restore 24dp paddingTop for appBarLayout
+            appBarLayout.setVisibility(View.VISIBLE);
+            DisplayMetrics metrics = new DisplayMetrics();
+            getWindowManager().getDefaultDisplay().getMetrics(metrics);
+            setupOrientation();
+
+            // Show other UI elements
+            cardIdFieldView.setVisibility(View.VISIBLE);
+            makeBottomSheetVisibleIfUseful();
+            editButton.show();

            // Unset fullscreen mode
            getWindow().getDecorView().setSystemUiVisibility(
-                getWindow().getDecorView().getSystemUiVisibility()
-                & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-                & ~View.SYSTEM_UI_FLAG_FULLSCREEN
+                    getWindow().getDecorView().getSystemUiVisibility()
+                            & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+                            & ~View.SYSTEM_UI_FLAG_FULLSCREEN
            );
-
-            // Turn barcode back to normal
-            barcodeImage.setLayoutParams(barcodeImageState);
-
-            // Fix barcode centering
-            barcodeImage.setAdjustViewBounds(true);
-
-            // Set current state
-            barcodeIsFullscreen = false;
        }
+
+        this.fullscreenType = fullscreenType;
    }
 }
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -4,62 +4,168 @@ import android.app.SearchManager;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.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.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
-import com.google.common.collect.ImmutableMap;

-import java.util.Calendar;
+import java.io.UnsupportedEncodingException;
 import java.util.List;
-import java.util.Map;
+
+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 = "Catima";
-    private static final int MAIN_REQUEST_CODE = 1;

-    private Menu menu;
-    protected String filter = "";
+    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);
+                try {
+                    importURIHelper.startShareIntent(mAdapter.getSelectedItems());
+                } catch (UnsupportedEncodingException e) {
+                    Toast.makeText(MainActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
+                    e.printStackTrace();
+                }
+                inputMode.finish();
+                return true;
+            }
+            else if(inputItem.getItemId() == R.id.action_edit)
+            {
+                if (mAdapter.getSelectedItemCount() != 1) {
+                    throw new IllegalArgumentException("Cannot edit more than 1 card at a time");
+                }
+
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putInt("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 = findViewById(R.id.toolbar);
        setSupportActionBar(toolbar);

-        updateLoyaltyCardList(filter, null);
+        updateLoyaltyCardList(mFilter, null);

        TabLayout groupsTabLayout = findViewById(R.id.groups);
        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
            @Override
            public void onTabSelected(TabLayout.Tab tab) {
                selectedTab = tab.getPosition();
-                updateLoyaltyCardList(filter, tab.getTag());
+                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
@@ -72,79 +178,153 @@ public class MainActivity extends AppCompatActivity

            }
        });
+
+        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
-    protected void onResume() {
+    protected void onResume()
+    {
        super.onResume();

-        if (menu != null)
+        if(mCurrentActionMode != null)
        {
-            SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+            mAdapter.clearSelections();
+            mCurrentActionMode.finish();
+        }

-            if (!searchView.isIconified()) {
-                filter = searchView.getQuery().toString();
+        if (mMenu != null)
+        {
+            SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();
+
+            if (!searchView.isIconified())
+            {
+                mFilter = searchView.getQuery().toString();
            }
        }

+        // Start of active tab logic
        TabLayout groupsTabLayout = findViewById(R.id.groups);
-        boolean hasReset = updateTabGroups(groupsTabLayout);
+        updateTabGroups(groupsTabLayout);
+
+        // 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(0);
-
-            if (!hasReset) {
-                tab = groupsTabLayout.getTabAt(selectedTab);
+            TabLayout.Tab tab = groupsTabLayout.getTabAt(selectedTab);
+            if (tab == null) {
+                tab = groupsTabLayout.getTabAt(0);
            }

            groupsTabLayout.selectTab(tab);
+            assert tab != null;
            group = tab.getTag();
        }
-        updateLoyaltyCardList(filter, group);
+        updateLoyaltyCardList(mFilter, group);
+        // End of active tab logic

        FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                startActivityForResult(i, MAIN_REQUEST_CODE);
-            }
+        addButton.setOnClickListener(v -> {
+            Intent i = new Intent(getApplicationContext(), ScanActivity.class);
+            startActivityForResult(i, Utils.BARCODE_SCAN);
        });
+        addButton.bringToFront();
    }

    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);

-        if (requestCode == MAIN_REQUEST_CODE)
-        {
+        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
-            filter = "";
-            if (menu != null)
+            mFilter = "";
+            if (mMenu != null)
            {
-                MenuItem searchItem = menu.findItem(R.id.action_search);
+                MenuItem searchItem = mMenu.findItem(R.id.action_search);
                searchItem.collapseActionView();
            }
-
-            // In case the theme changed
            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 void onBackPressed() {
-        if (menu == null)
+    public void onBackPressed()
+    {
+        if (mMenu == null)
        {
            super.onBackPressed();
            return;
        }

-        SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+        SearchView searchView = (SearchView) mMenu.findItem(R.id.action_search).getActionView();

-        if (!searchView.isIconified()) {
+        if (!searchView.isIconified())
+        {
            searchView.setIconified(true);
        } else {
            TabLayout groupsTabLayout = findViewById(R.id.groups);
@@ -165,21 +345,29 @@ public class MainActivity extends AppCompatActivity
            group = (Group) tag;
        }

-        final ListView cardList = findViewById(R.id.list);
+        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);
-        final DBHelper db = new DBHelper(this);

-        Cursor cardCursor = db.getLoyaltyCardCursor(filterText, group);
+        Cursor cardCursor = mDB.getLoyaltyCardCursor(filterText, group);

-        if(db.getLoyaltyCardCount() > 0)
+        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
-            cardList.setVisibility(View.VISIBLE);
+            mCardList.setVisibility(View.VISIBLE);
            helpText.setVisibility(View.GONE);
-            if(cardCursor.getCount() > 0)
+            if(mAdapter.getItemCount() > 0)
            {
                noMatchingCardsText.setVisibility(View.GONE);
            }
@@ -190,38 +378,17 @@ public class MainActivity extends AppCompatActivity
        }
        else
        {
-            cardList.setVisibility(View.GONE);
+            mCardList.setVisibility(View.GONE);
            helpText.setVisibility(View.VISIBLE);
            noMatchingCardsText.setVisibility(View.GONE);
        }

-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
-        cardList.setAdapter(adapter);
-
-        registerForContextMenu(cardList);
-
-        cardList.setOnItemClickListener(new AdapterView.OnItemClickListener()
-        {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id)
-            {
-                Cursor selected = (Cursor) parent.getItemAtPosition(position);
-                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(selected);
-
-                Intent i = new Intent(view.getContext(), 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, MAIN_REQUEST_CODE);
-            }
-        });
+        if (mCurrentActionMode != null) {
+            mCurrentActionMode.finish();
+        }
    }

-    public boolean updateTabGroups(TabLayout groupsTabLayout)
+    public void updateTabGroups(TabLayout groupsTabLayout)
    {
        final DBHelper db = new DBHelper(this);

@@ -230,254 +397,121 @@ public class MainActivity extends AppCompatActivity
        if (newGroups.size() == 0) {
            groupsTabLayout.removeAllTabs();
            groupsTabLayout.setVisibility(View.GONE);
-            return true;
+            return;
        }

-        // -1 because there is an "All" tab
-        boolean isChanged = groupsTabLayout.getTabCount() - 1 != newGroups.size();
+        groupsTabLayout.removeAllTabs();

-        if (!isChanged) {
-            for (int i = 0; i < newGroups.size(); i++) {
-                if (!((Group) groupsTabLayout.getTabAt(i + 1).getTag())._id.equals(newGroups.get(i)._id)) {
-                    isChanged = true;
-                    break;
-                }
-            }
+        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);
        }

-        if (isChanged) {
-            groupsTabLayout.removeAllTabs();
+        groupsTabLayout.setVisibility(View.VISIBLE);
+    }

-            TabLayout.Tab allTab = groupsTabLayout.newTab();
-            allTab.setText(R.string.all);
-            allTab.setTag(null);
-            groupsTabLayout.addTab(allTab);
-
-            for (Group group : newGroups) {
-                TabLayout.Tab tab = groupsTabLayout.newTab();
-                tab.setText(group._id);
-                tab.setTag(group);
-                groupsTabLayout.addTab(tab);
-            }
-
-            groupsTabLayout.setVisibility(View.VISIBLE);
-
-            return true;
-        }
-
-        return false;
+    private void openPrivacyPolicy() {
+        Intent browserIntent = new Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse("https://catima.app/privacy-policy")
+        );
+        startActivity(browserIntent);
    }

    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo)
+    public boolean onCreateOptionsMenu(Menu inputMenu)
    {
-        super.onCreateContextMenu(menu, v, menuInfo);
-        if (v.getId()==R.id.list)
-        {
-            MenuInflater inflater = getMenuInflater();
-            inflater.inflate(R.menu.card_longclick_menu, menu);
-        }
-    }
+        this.mMenu = inputMenu;

-    @Override
-    public boolean onContextItemSelected(MenuItem item)
-    {
-        AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
-        ListView listView = findViewById(R.id.list);
-
-        Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
-        LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
-
-        if(item.getItemId() == R.id.action_clipboard)
-        {
-            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-            ClipData clip = ClipData.newPlainText(card.store, card.cardId);
-            clipboard.setPrimaryClip(clip);
-
-            Toast.makeText(this, R.string.copy_to_clipboard_toast, Toast.LENGTH_LONG).show();
-            return true;
-        }
-        else if(item.getItemId() == R.id.action_share)
-        {
-            final ImportURIHelper importURIHelper = new ImportURIHelper(this);
-            importURIHelper.startShareIntent(card);
-            return true;
-        }
-
-        return super.onContextItemSelected(item);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        this.menu = menu;
-
-        getMenuInflater().inflate(R.menu.main_menu, menu);
+        getMenuInflater().inflate(R.menu.main_menu, inputMenu);

        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        if (searchManager != null) {
-            SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+        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.setOnCloseListener(() -> {
+                invalidateOptionsMenu();
+                return false;
            });

-            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener()
+            {
                @Override
-                public boolean onQueryTextSubmit(String query) {
+                public boolean onQueryTextSubmit(String query)
+                {
                    return false;
                }

                @Override
-                public boolean onQueryTextChange(String newText) {
-                    filter = newText;
+                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
+                    );

-                    updateLoyaltyCardList(newText, groupsTabLayout.getTabCount() > 0 ? groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition()).getTag() : null);
                    return true;
                }
            });
        }
-
-        return super.onCreateOptionsMenu(menu);
+        return super.onCreateOptionsMenu(inputMenu);
    }

    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
+    public boolean onOptionsItemSelected(MenuItem inputItem)
    {
-        int id = item.getItemId();
+        int id = inputItem.getItemId();

        if (id == R.id.action_manage_groups)
        {
            Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
-            startActivityForResult(i, MAIN_REQUEST_CODE);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
            return true;
        }

-        if(id == R.id.action_import_export)
+        if (id == R.id.action_import_export)
        {
            Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
-            startActivityForResult(i, MAIN_REQUEST_CODE);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
            return true;
        }

-        if(id == R.id.action_settings)
+        if (id == R.id.action_settings)
        {
            Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
-            startActivityForResult(i, MAIN_REQUEST_CODE);
+            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);
-    }
-
-    private void displayAboutDialog()
-    {
-        final Map<String, String> USED_LIBRARIES = new ImmutableMap.Builder<String, String>()
-            .put("Commons CSV", "https://commons.apache.org/proper/commons-csv/")
-            .put("Guava", "https://github.com/google/guava")
-            .put("ZXing", "https://github.com/zxing/zxing")
-            .put("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded")
-            .put("AppIntro", "https://github.com/apl-devs/AppIntro")
-            .put("Color Picker", "https://github.com/jaredrummler/ColorPicker")
-            .put("VNTNumberPickerPreference", "https://github.com/vanniktech/VNTNumberPickerPreference")
-            .build();
-
-        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())
+        if (id == R.id.action_about)
        {
-            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);
+            Intent i = new Intent(getApplicationContext(), AboutActivity.class);
+            startActivityForResult(i, Utils.MAIN_REQUEST);
+            return true;
        }

-        WebView wv = new WebView(this);
-
-        // Set CSS for dark mode if dark mode
-        String css = "";
-        if(isDarkModeEnabled(this))
-        {
-            css = "<style>body {color:white; background-color:black;}</style>";
-        }
-
-        String html =
-            "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
-            css +
-            "<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) + "\">" +
-                            "GitHub" +
-                            "</a>") +
-            "</p><hr/><p>" +
-            String.format(getString(R.string.app_copyright_fmt), year) +
-            "</p><p>" +
-            getString(R.string.app_copyright_old) +
-            "</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();
+        return super.onOptionsItemSelected(inputItem);
    }

    protected static boolean isDarkModeEnabled(Context inputContext)
@@ -486,4 +520,149 @@ public class MainActivity extends AppCompatActivity
        int currentNightMode = config.uiMode & Configuration.UI_MODE_NIGHT_MASK;
        return (currentNightMode == Configuration.UI_MODE_NIGHT_YES);
    }
+
+    @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)
+    {
+        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(getResources().getQuantityString(R.plurals.selectedCardCount, count, count));
+
+            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);
+        }
+    }
 }
--- a/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupsActivity.java
@@ -1,11 +1,14 @@
 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;
@@ -13,6 +16,8 @@ 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;
@@ -22,7 +27,6 @@ public class ManageGroupsActivity extends AppCompatActivity
 {
    private static final String TAG = "Catima";

-    private AlertDialog newGroupDialog;
    private final DBHelper db = new DBHelper(this);

    @Override
@@ -38,8 +42,6 @@ public class ManageGroupsActivity extends AppCompatActivity
            actionBar.setDisplayHomeAsUpEnabled(true);
        }

-        newGroupDialog = createNewGroupDialog();
-
        updateGroupList();
    }

@@ -50,12 +52,8 @@ public class ManageGroupsActivity extends AppCompatActivity
        updateGroupList();

        FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                newGroupDialog.show();
-            }
-        });
+        addButton.setOnClickListener(v -> createGroup());
+        addButton.bringToFront();
    }

    @Override
@@ -88,6 +86,16 @@ public class ManageGroupsActivity extends AppCompatActivity
        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)
    {
@@ -100,12 +108,16 @@ public class ManageGroupsActivity extends AppCompatActivity
        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) {
-        LinearLayout parentRow = (LinearLayout) view.getParent();
-
-        TextView groupNameTextView = (TextView) parentRow.findViewById(R.id.name);
-
-        final String groupName = (String) groupNameTextView.getText();
+        final String groupName = getGroupname(view);

        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        builder.setTitle(R.string.enter_group_name);
@@ -129,14 +141,12 @@ public class ManageGroupsActivity extends AppCompatActivity
        });
        AlertDialog dialog = builder.create();
        dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        input.requestFocus();
    }

    public void deleteGroup(View view) {
-        LinearLayout parentRow = (LinearLayout) view.getParent();
-
-        TextView groupNameTextView = (TextView) parentRow.findViewById(R.id.name);
-
-        final String groupName = (String) groupNameTextView.getText();
+        final String groupName = getGroupname(view);

        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        builder.setTitle(R.string.deleteConfirmationGroup);
@@ -147,6 +157,8 @@ public class ManageGroupsActivity extends AppCompatActivity
            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() {
@@ -159,7 +171,7 @@ public class ManageGroupsActivity extends AppCompatActivity
        dialog.show();
    }

-    private AlertDialog createNewGroupDialog() {
+    private void createGroup() {
        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        builder.setTitle(R.string.enter_group_name);
        final EditText input = new EditText(this);
@@ -180,7 +192,60 @@ public class ManageGroupsActivity extends AppCompatActivity
            }
        });
        AlertDialog dialog = builder.create();
+        dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        input.requestFocus();
+    }

-        return dialog;
+    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();
    }
 }
--- a/app/src/main/java/protect/card_locker/MultiFormatImporter.java
+++ b/app/src/main/java/protect/card_locker/MultiFormatImporter.java
@@ -1,62 +0,0 @@
-package protect.card_locker;
-
-import android.util.Log;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class MultiFormatImporter
-{
-    private static final String TAG = "Catima";
-
-    /**
-     * Attempts to import data from the input stream of the
-     * given format into the database.
-     *
-     * The input stream is not closed, and doing so is the
-     * responsibility of the caller.
-     *
-     * @return true if the database was successfully imported,
-     * false otherwise. If false, no data was written to
-     * the database.
-     */
-    public static boolean importData(DBHelper db, InputStreamReader input, DataFormat format)
-    {
-        DatabaseImporter importer = null;
-
-        switch(format)
-        {
-            case CSV:
-                importer = new CsvDatabaseImporter();
-                break;
-        }
-
-        if(importer != null)
-        {
-            try
-            {
-                importer.importData(db, input);
-                return true;
-            }
-            catch(IOException e)
-            {
-                Log.e(TAG, "Failed to input data", e);
-            }
-            catch(FormatException e)
-            {
-                Log.e(TAG, "Failed to input data", e);
-            }
-            catch(InterruptedException e)
-            {
-                Log.e(TAG, "Failed to input data", e);
-            }
-
-            return false;
-        }
-        else
-        {
-            Log.e(TAG, "Unsupported data format imported: " + format.name());
-            return false;
-        }
-    }
-}
--- a/app/src/main/java/protect/card_locker/ScanActivity.java
+++ b/app/src/main/java/protect/card_locker/ScanActivity.java
@@ -0,0 +1,191 @@
+package protect.card_locker;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+import 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 boolean torch = false;
+
+    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 onCreateOptionsMenu(Menu menu)
+    {
+        if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_FLASH)) {
+            getMenuInflater().inflate(R.menu.scan_menu, menu);
+        }
+
+        barcodeScannerView.setTorchOff();
+
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
+        if (item.getItemId() == android.R.id.home)
+        {
+            setResult(Activity.RESULT_CANCELED);
+            finish();
+            return true;
+        } else if (item.getItemId() == R.id.action_toggle_flashlight)
+        {
+            if (torch) {
+                torch = false;
+                barcodeScannerView.setTorchOff();
+                item.setTitle(R.string.turn_flashlight_on);
+                item.setIcon(R.drawable.ic_flashlight_off_white_24dp);
+            } else {
+                torch = true;
+                barcodeScannerView.setTorchOn();
+                item.setTitle(R.string.turn_flashlight_off);
+                item.setIcon(R.drawable.ic_flashlight_on_white_24dp);
+            }
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @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);
+    }
+}
--- a/app/src/main/java/protect/card_locker/ThirdPartyInfo.java
+++ b/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;
+    }
+}
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -1,21 +1,81 @@
 package protect.card_locker;

+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Color;
+import android.graphics.Matrix;
+import android.media.ExifInterface;
+import android.provider.MediaStore;
+import android.util.Base64;
+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.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.util.Calendar;
+import java.util.Currency;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;

 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;
+    public static final int CARD_IMAGE_FROM_CAMERA_FRONT = 5;
+    public static final int CARD_IMAGE_FROM_CAMERA_BACK = 6;
+    public static final int CARD_IMAGE_FROM_FILE_FRONT = 7;
+    public static final int CARD_IMAGE_FROM_FILE_BACK = 8;
+
    static final double LUMINANCE_MIDPOINT = 0.5;

+    static final int BITMAP_SIZE_BIG = 512;
+
    static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor) {
+        return generateIcon(context, store, backgroundColor, false);
+    }
+
+    static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor, boolean forShortcut) {
        if (store.length() == 0) {
            return null;
        }

-        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        int 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);
    }
@@ -23,4 +83,262 @@ public class Utils {
    static public boolean needsDarkForeground(Integer backgroundColor) {
        return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
    }
+
+    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent, Context context) {
+        String contents;
+        String format;
+
+        if (resultCode != Activity.RESULT_OK) {
+            return new BarcodeValues(null, null);
+        }
+
+        if (requestCode == Utils.BARCODE_IMPORT_FROM_IMAGE_FILE) {
+            Log.i(TAG, "Received image file with possible barcode");
+
+            Bitmap bitmap;
+            try {
+                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);
+    }
+
+    static public byte[] bitmapToByteArray(Bitmap bitmap) {
+        if (bitmap == null) {
+            return null;
+        }
+
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, bos);
+        return bos.toByteArray();
+    }
+
+    static public Bitmap resizeBitmap(Bitmap bitmap) {
+        if (bitmap == null) {
+            return null;
+        }
+
+        Integer maxSize = BITMAP_SIZE_BIG;
+
+        Integer width = bitmap.getWidth();
+        Integer height = bitmap.getHeight();
+
+        if (height > width) {
+            Integer scale = height / maxSize;
+            height = maxSize;
+            width = width / scale;
+        } else if (width > height) {
+            Integer scale = width / maxSize;
+            width = maxSize;
+            height = height / scale;
+        } else {
+            height = maxSize;
+            width = maxSize;
+        }
+
+        return Bitmap.createScaledBitmap(bitmap, width, height, true);
+    }
+
+    static public Bitmap rotateBitmap(Bitmap bitmap, ExifInterface exifInterface) {
+        switch (exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_UNDEFINED)) {
+            case ExifInterface.ORIENTATION_ROTATE_90:
+                return rotateBitmap(bitmap, 90f);
+            case ExifInterface.ORIENTATION_ROTATE_180:
+                return rotateBitmap(bitmap, 180f);
+            case ExifInterface.ORIENTATION_ROTATE_270:
+                return rotateBitmap(bitmap, 270f);
+            default:
+                return bitmap;
+        }
+    }
+
+    static public Bitmap rotateBitmap(Bitmap bitmap, float rotation) {
+        if (rotation == 0) {
+            return bitmap;
+        }
+
+        Matrix matrix = new Matrix();
+        matrix.postRotate(rotation);
+        return Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+    }
+
+    static public String getCardImageFileName(int loyaltyCardId, boolean front) {
+        StringBuilder cardImageFileNameBuilder = new StringBuilder();
+
+        cardImageFileNameBuilder.append("card_");
+        cardImageFileNameBuilder.append(loyaltyCardId);
+        cardImageFileNameBuilder.append("_");
+        if (front) {
+            cardImageFileNameBuilder.append("front");
+        } else {
+            cardImageFileNameBuilder.append("back");
+        }
+        cardImageFileNameBuilder.append(".png");
+
+        return cardImageFileNameBuilder.toString();
+    }
+
+    static public void saveCardImage(Context context, Bitmap bitmap, String fileName) throws FileNotFoundException {
+        if (bitmap == null) {
+            context.deleteFile(fileName);
+            return;
+        }
+
+        FileOutputStream out = context.openFileOutput(fileName, Context.MODE_PRIVATE);
+
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
+    }
+
+    static public void saveCardImage(Context context, Bitmap bitmap, int loyaltyCardId, boolean front) throws FileNotFoundException {
+        saveCardImage(context, bitmap, getCardImageFileName(loyaltyCardId, front));
+    }
+
+    static public Bitmap retrieveCardImage(Context context, String fileName) {
+        FileInputStream in;
+        try {
+            in = context.openFileInput(fileName);
+        } catch (FileNotFoundException e) {
+            return null;
+        }
+
+        return BitmapFactory.decodeStream(in);
+    }
+
+    static public Bitmap retrieveCardImage(Context context, int loyaltyCardId, boolean front) {
+        return retrieveCardImage(context, getCardImageFileName(loyaltyCardId, front));
+    }
+
+    static public Object hashmapGetOrDefault(HashMap hashMap, Object key, Object defaultValue, Class keyType) {
+        Object value = hashMap.get(keyType.cast(key));
+        if (value == null) {
+            return defaultValue;
+        }
+        return value;
+    }
+
+    static public Object hashmapGetOrDefault(HashMap hashMap, String key, Object defaultValue) {
+        return hashmapGetOrDefault(hashMap, key, defaultValue, String.class);
+    }
 }
--- a/app/src/main/java/protect/card_locker/ZipUtils.java
+++ b/app/src/main/java/protect/card_locker/ZipUtils.java
@@ -0,0 +1,36 @@
+package protect.card_locker;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+public class ZipUtils {
+    static public String read(ZipInputStream zipInputStream) throws IOException {
+        StringBuilder stringBuilder = new StringBuilder();
+        Reader reader = new BufferedReader(new InputStreamReader(zipInputStream, StandardCharsets.UTF_8));
+        int c;
+        while ((c = reader.read()) != -1) {
+            stringBuilder.append((char) c);
+        }
+        return stringBuilder.toString();
+    }
+
+    static public Bitmap readImage(ZipInputStream zipInputStream) {
+        return BitmapFactory.decodeStream(zipInputStream);
+    }
+
+    static public JSONObject readJSON(ZipInputStream zipInputStream) throws IOException, JSONException {
+        return new JSONObject(read(zipInputStream));
+    }
+}
--- a/app/src/main/java/protect/card_locker/importexport/CSVHelpers.java
+++ b/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);
+        }
+    }
+}
--- a/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java
@@ -0,0 +1,189 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+
+import net.lingala.zip4j.ZipFile;
+import net.lingala.zip4j.io.outputstream.ZipOutputStream;
+import net.lingala.zip4j.model.ZipParameters;
+import net.lingala.zip4j.util.InternalZipConstants;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
+
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.ZipEntry;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.Group;
+import protect.card_locker.LoyaltyCard;
+import protect.card_locker.Utils;
+
+/**
+ * Class for exporting the database into CSV (Comma Separate Values)
+ * format.
+ */
+public class CatimaExporter implements Exporter
+{
+    public void exportData(Context context, DBHelper db, OutputStream output) throws IOException, InterruptedException
+    {
+        // Necessary vars
+        int readLen;
+        byte[] readBuffer = new byte[InternalZipConstants.BUFF_SIZE];
+
+        // Create zip output stream
+        ZipOutputStream zipOutputStream = new ZipOutputStream(output);
+
+        // Generate CSV
+        ByteArrayOutputStream catimaOutputStream = new ByteArrayOutputStream();
+        OutputStreamWriter catimaOutputStreamWriter = new OutputStreamWriter(catimaOutputStream, StandardCharsets.UTF_8);
+        writeCSV(db, catimaOutputStreamWriter);
+
+        // Add CSV to zip file
+        ZipParameters csvZipParameters = new ZipParameters();
+        csvZipParameters.setFileNameInZip("catima.csv");
+        zipOutputStream.putNextEntry(csvZipParameters);
+        InputStream csvInputStream = new ByteArrayInputStream(catimaOutputStream.toByteArray());
+        while ((readLen = csvInputStream.read(readBuffer)) != -1) {
+            zipOutputStream.write(readBuffer, 0, readLen);
+        }
+        zipOutputStream.closeEntry();
+
+        // Loop over all cards again
+        Cursor cardCursor = db.getLoyaltyCardCursor();
+        while(cardCursor.moveToNext())
+        {
+            // For each card
+            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
+
+            // Prepare looping over both front and back image
+            boolean[] frontValues = new boolean[2];
+            frontValues[0] = true;
+            frontValues[1] = false;
+
+            // For each image
+            for (boolean front : frontValues) {
+                // If it exists, add to the .zip file
+                Bitmap image = Utils.retrieveCardImage(context, card.id, front);
+                if (image != null) {
+                    ZipParameters imageZipParameters = new ZipParameters();
+                    imageZipParameters.setFileNameInZip(Utils.getCardImageFileName(card.id, front));
+                    zipOutputStream.putNextEntry(imageZipParameters);
+                    InputStream imageInputStream = new ByteArrayInputStream(Utils.bitmapToByteArray(image));
+                    while ((readLen = imageInputStream.read(readBuffer)) != -1) {
+                        zipOutputStream.write(readBuffer, 0, readLen);
+                    }
+                    zipOutputStream.closeEntry();
+                }
+            }
+        }
+
+        zipOutputStream.close();
+    }
+
+    private void writeCSV(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.BARCODE_ID,
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE,
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
+                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.barcodeId,
+                    card.barcodeType,
+                    card.headerColor,
+                    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();
+    }
+}
--- a/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CatimaImporter.java
@@ -1,17 +1,36 @@
-package protect.card_locker;
+package protect.card_locker.importexport;

+import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;

+import com.google.zxing.BarcodeFormat;
+
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+import net.lingala.zip4j.model.LocalFileHeader;
+
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;

+import java.io.BufferedInputStream;
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.util.Currency;
+import java.util.Date;
 import java.util.List;

+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+import protect.card_locker.Group;
+import protect.card_locker.Utils;
+import protect.card_locker.ZipUtils;
+
 /**
 * Class for importing a database from CSV (Comma Separate Values)
 * formatted data.
@@ -19,11 +38,37 @@ import java.util.List;
 * 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 class CatimaImporter implements Importer
 {
-    public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException
-    {
-        BufferedReader bufferedReader = new BufferedReader(input);
+    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, InterruptedException {
+        InputStream bufferedInputStream = new BufferedInputStream(input);
+        bufferedInputStream.mark(100);
+
+        // First, check if this is a zip file
+        ZipInputStream zipInputStream = new ZipInputStream(bufferedInputStream);
+        LocalFileHeader localFileHeader = zipInputStream.getNextEntry();
+
+        if (localFileHeader == null) {
+            // This is not a zip file, try importing as bare CSV
+            bufferedInputStream.reset();
+            importCSV(context, db, bufferedInputStream);
+            return;
+        }
+
+        importZipFile(context, db, zipInputStream, localFileHeader);
+    }
+
+    public void importZipFile(Context context, DBHelper db, ZipInputStream input, LocalFileHeader localFileHeader) throws IOException, FormatException, InterruptedException {
+        String fileName = localFileHeader.getFileName();
+        if (fileName.equals("catima.csv")) {
+            importCSV(context, db, new ByteArrayInputStream(ZipUtils.read(input).getBytes(StandardCharsets.UTF_8)));
+        } else {
+            Utils.saveCardImage(context, ZipUtils.readImage(input), fileName);
+        }
+    }
+
+    public void importCSV(Context context, DBHelper db, InputStream input) throws IOException, FormatException, InterruptedException {
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));

        bufferedReader.mark(100);

@@ -39,17 +84,19 @@ public class CsvDatabaseImporter implements DatabaseImporter

        switch (version) {
            case 1:
-                parseV1(db, bufferedReader);
+                parseV1(context, db, bufferedReader);
                break;
            case 2:
-                parseV2(db, bufferedReader);
+                parseV2(context, 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
+    public void parseV1(Context context, DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
    {
        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.withHeader());

@@ -60,7 +107,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
        {
            for (CSVRecord record : parser)
            {
-                importLoyaltyCard(database, db, record);
+                importLoyaltyCard(context, database, db, record);

                if(Thread.currentThread().isInterrupted())
                {
@@ -82,7 +129,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
        }
    }

-    public void parseV2(DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
+    public void parseV2(Context context, DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
    {
        SQLiteDatabase database = db.getWritableDatabase();
        database.beginTransaction();
@@ -103,7 +150,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
                            parseV2Groups(db, database, stringPart);
                            break;
                        case 2:
-                            parseV2Cards(db, database, stringPart);
+                            parseV2Cards(context, db, database, stringPart);
                            break;
                        case 3:
                            parseV2CardGroups(db, database, stringPart);
@@ -131,7 +178,6 @@ public class CsvDatabaseImporter implements DatabaseImporter
        }
    }

-
    public void parseV2Groups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
    {
        // Parse groups
@@ -145,30 +191,30 @@ public class CsvDatabaseImporter implements DatabaseImporter
                    throw new InterruptedException();
                }
            }
-
-            groupParser.close();
        } 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
+    public void parseV2Cards(Context context, DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
    {
        // Parse cards
        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());

        try {
            for (CSVRecord record : cardParser) {
-                importLoyaltyCard(database, db, record);
+                importLoyaltyCard(context, database, db, record);

                if (Thread.currentThread().isInterrupted()) {
                    throw new InterruptedException();
                }
            }
-
-            cardParser.close();
        } catch (IllegalArgumentException | IllegalStateException e) {
            throw new FormatException("Issue parsing CSV data", e);
+        } finally {
+            cardParser.close();
        }
    }

@@ -185,66 +231,10 @@ public class CsvDatabaseImporter implements DatabaseImporter
                    throw new InterruptedException();
                }
            }
-
-            cardGroupParser.close();
        } catch (IllegalArgumentException | IllegalStateException e) {
            throw new FormatException("Issue parsing CSV data", e);
-        }
-    }
-
-    /**
-     * Extract a string from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, defaultValue is returned
-     * if it is not null. Otherwise, a FormatException is thrown.
-     */
-    private String extractString(String key, CSVRecord record, String defaultValue)
-            throws FormatException
-    {
-        String toReturn = defaultValue;
-
-        if(record.isMapped(key))
-        {
-            toReturn = record.get(key);
-        }
-        else
-        {
-            if(defaultValue == null)
-            {
-                throw new FormatException("Field not used but expected: " + key);
-            }
-        }
-
-        return toReturn;
-    }
-
-    /**
-     * Extract an integer from the items array. The index into the array
-     * is determined by looking up the index in the fields map using the
-     * "key" as the key. If no such key exists, or the data is not a valid
-     * int, a FormatException is thrown.
-     */
-    private Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
-            throws FormatException
-    {
-        if(record.isMapped(key) == false)
-        {
-            throw new FormatException("Field not used but expected: " + key);
-        }
-
-        String value = record.get(key);
-        if(value.isEmpty() && nullIsOk)
-        {
-            return null;
-        }
-
-        try
-        {
-            return Integer.parseInt(record.get(key));
-        }
-        catch(NumberFormatException e)
-        {
-            throw new FormatException("Failed to parse field: " + key, e);
+        } finally {
+            cardGroupParser.close();
        }
    }

@@ -252,43 +242,74 @@ public class CsvDatabaseImporter implements DatabaseImporter
     * Import a single loyalty card into the database using the given
     * session.
     */
-    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
+    private void importLoyaltyCard(Context context, SQLiteDatabase database, DBHelper helper, CSVRecord record)
            throws IOException, FormatException
    {
-        int id = extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
+        int id = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);

-        String store = extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
+        String store = CSVHelpers.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 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) { }

-        String cardId = extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
+        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 barcodeType = extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
+        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 = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
+            headerColor = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
        }

        int starStatus = 0;
        try {
-            starStatus = extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
+            starStatus = CSVHelpers.extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
        } catch (FormatException _e ) {
-            // This field did not exist in versions 0.28 and before
+            // This field did not exist in versions 0.278 and before
            // We catch this exception so we can still import old backups
        }
        if (starStatus != 1) starStatus = 0;
-        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, starStatus);
+
+        helper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeId, barcodeType, headerColor, starStatus);
    }

    /**
@@ -298,7 +319,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
    private void importGroup(SQLiteDatabase database, DBHelper helper, CSVRecord record)
            throws IOException, FormatException
    {
-        String id = extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
+        String id = CSVHelpers.extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);

        helper.insertGroup(database, id);
    }
@@ -310,8 +331,8 @@ public class CsvDatabaseImporter implements DatabaseImporter
    private void importCardGroupMapping(SQLiteDatabase database, DBHelper helper, CSVRecord record)
            throws IOException, FormatException
    {
-        Integer cardId = extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
-        String groupId = extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
+        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));
--- a/app/src/main/java/protect/card_locker/importexport/DataFormat.java
+++ b/app/src/main/java/protect/card_locker/importexport/DataFormat.java
@@ -0,0 +1,10 @@
+package protect.card_locker.importexport;
+
+public enum DataFormat
+{
+    Catima,
+    Fidme,
+    Stocard,
+    VoucherVault
+    ;
+}
--- a/app/src/main/java/protect/card_locker/importexport/Exporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/Exporter.java
@@ -0,0 +1,22 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+
+import java.io.IOException;
+import java.io.OutputStream;
+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.
+ */
+public interface Exporter
+{
+    /**
+     * Export the database to the output stream in a given format.
+     * @throws IOException
+     */
+    void exportData(Context context, DBHelper db, OutputStream output) throws IOException, InterruptedException;
+}
--- a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
@@ -0,0 +1,139 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+
+import com.google.zxing.BarcodeFormat;
+
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+import net.lingala.zip4j.model.LocalFileHeader;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+
+import protect.card_locker.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 Importer
+{
+    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
+        // We actually retrieve a .zip file
+        ZipInputStream zipInputStream = new ZipInputStream(input, password);
+
+        StringBuilder loyaltyCards = new StringBuilder();
+        byte[] buffer = new byte[1024];
+        int read = 0;
+
+        LocalFileHeader localFileHeader;
+
+        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
+            if (localFileHeader.getFileName().equals("loyalty_programs.csv")) {
+                while ((read = zipInputStream.read(buffer, 0, 1024)) >= 0) {
+                    loyaltyCards.append(new String(buffer, 0, read, StandardCharsets.UTF_8));
+                }
+            }
+        }
+
+        if (loyaltyCards.length() == 0) {
+            throw new FormatException("Couldn't find loyalty_programs.csv in zip file or it is empty");
+        }
+
+        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, "").trim();
+        String addedAt = CSVHelpers.extractString("Added At", record, "").trim();
+        String firstName = CSVHelpers.extractString("Firstname", record, "").trim();
+        String lastName = CSVHelpers.extractString("Lastname", record, "").trim();
+
+        String combinedName = String.format("%s %s", firstName, lastName).trim();
+
+        StringBuilder noteBuilder = new StringBuilder();
+        if (!program.isEmpty()) noteBuilder.append(program).append('\n');
+        if (!addedAt.isEmpty()) noteBuilder.append(addedAt).append('\n');
+        if (!combinedName.isEmpty()) noteBuilder.append(combinedName).append('\n');
+        String note = noteBuilder.toString().trim();
+
+        // The ID is called reference
+        String cardId = CSVHelpers.extractString("Reference", record, "");
+        if(cardId.isEmpty())
+        {
+            throw new FormatException("No card ID listed, but is required");
+        }
+
+        // Sadly, Fidme exports don't contain the card type
+        // I guess they have an online DB of all the different companies and what type they use
+        // TODO: Hook this into our own loyalty card DB if we ever get one
+        BarcodeFormat barcodeType = null;
+
+        // No favourite data in the export either
+        int starStatus = 0;
+
+        // TODO: Front and back image
+
+        helper.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, starStatus);
+    }
+}
--- a/app/src/main/java/protect/card_locker/importexport/ImportExportResult.java
+++ b/app/src/main/java/protect/card_locker/importexport/ImportExportResult.java
@@ -0,0 +1,9 @@
+package protect.card_locker.importexport;
+
+public enum ImportExportResult
+{
+    Success,
+    GenericFailure,
+    BadPassword
+    ;
+}
--- a/app/src/main/java/protect/card_locker/importexport/Importer.java
+++ b/app/src/main/java/protect/card_locker/importexport/Importer.java
@@ -0,0 +1,27 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+
+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 Importer
+{
+    /**
+     * Import data from the input stream in a given format into
+     * the database.
+     * @throws IOException
+     * @throws FormatException
+     */
+    void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
+}
--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatExporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatExporter.java
@@ -1,10 +1,14 @@
-package protect.card_locker;
+package protect.card_locker.importexport;

+import android.content.Context;
 import android.util.Log;

 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.OutputStreamWriter;

+import protect.card_locker.DBHelper;
+
 public class MultiFormatExporter
 {
    private static final String TAG = "Catima";
@@ -15,18 +19,21 @@ public class MultiFormatExporter
     *
     * The output stream is closed on success.
     *
-     * @return true if the database was successfully exported,
-     * false otherwise. If false, partial data may have been
+     * @return ImportExportResult.Success if the database was successfully exported,
+     * another ImportExportResult otherwise. If not Success, partial data may have been
     * written to the output stream, and it should be discarded.
     */
-    public static boolean exportData(DBHelper db, OutputStreamWriter output, DataFormat format)
+    public static ImportExportResult exportData(Context context, DBHelper db, OutputStream output, DataFormat format)
    {
-        DatabaseExporter exporter = null;
+        Exporter exporter = null;

        switch(format)
        {
-            case CSV:
-                exporter = new CsvDatabaseExporter();
+            case Catima:
+                exporter = new CatimaExporter();
+                break;
+            default:
+                Log.e(TAG, "Failed to export data, unknown format " + format.name());
                break;
        }

@@ -34,8 +41,8 @@ public class MultiFormatExporter
        {
            try
            {
-                exporter.exportData(db, output);
-                return true;
+                exporter.exportData(context, db, output);
+                return ImportExportResult.Success;
            }
            catch(IOException e)
            {
@@ -46,12 +53,12 @@ public class MultiFormatExporter
                Log.e(TAG, "Failed to export data", e);
            }

-            return false;
+            return ImportExportResult.GenericFailure;
        }
        else
        {
            Log.e(TAG, "Unsupported data format exported: " + format.name());
-            return false;
+            return ImportExportResult.GenericFailure;
        }
    }
 }
--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
@@ -0,0 +1,76 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.util.Log;
+
+import net.lingala.zip4j.exception.ZipException;
+
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.ParseException;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+
+public class MultiFormatImporter
+{
+    private static final String TAG = "Catima";
+
+    /**
+     * Attempts to import data from the input stream of the
+     * given format into the database.
+     *
+     * The input stream is not closed, and doing so is the
+     * responsibility of the caller.
+     *
+     * @return ImportExportResult.Success if the database was successfully imported,
+     * or another result otherwise. If no Success, no data was written to
+     * the database.
+     */
+    public static ImportExportResult importData(Context context, DBHelper db, InputStream input, DataFormat format, char[] password)
+    {
+        Importer importer = null;
+
+        switch(format)
+        {
+            case Catima:
+                importer = new CatimaImporter();
+                break;
+            case Fidme:
+                importer = new FidmeImporter();
+                break;
+            case Stocard:
+                importer = new StocardImporter();
+                break;
+            case VoucherVault:
+                importer = new VoucherVaultImporter();
+                break;
+        }
+
+        if (importer != null)
+        {
+            try
+            {
+                importer.importData(context, db, input, password);
+                return ImportExportResult.Success;
+            }
+            catch(ZipException e)
+            {
+                return ImportExportResult.BadPassword;
+            }
+            catch(IOException | FormatException | InterruptedException | JSONException | ParseException | NullPointerException e)
+            {
+                Log.e(TAG, "Failed to import data", e);
+            }
+
+        }
+        else
+        {
+            Log.e(TAG, "Unsupported data format imported: " + format.name());
+        }
+
+        return ImportExportResult.GenericFailure;
+    }
+}
--- a/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/StocardImporter.java
@@ -0,0 +1,232 @@
+package protect.card_locker.importexport;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+
+import com.google.zxing.BarcodeFormat;
+
+import net.lingala.zip4j.io.inputstream.ZipInputStream;
+import net.lingala.zip4j.model.LocalFileHeader;
+
+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.io.Reader;
+import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import protect.card_locker.DBHelper;
+import protect.card_locker.FormatException;
+import protect.card_locker.Utils;
+import protect.card_locker.ZipUtils;
+
+/**
+ * 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 StocardImporter implements Importer
+{
+    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
+        HashMap<String, HashMap<String, Object>> loyaltyCardHashMap = new HashMap<>();
+        HashMap<String, String> providers = new HashMap<>();
+
+        ZipInputStream zipInputStream = new ZipInputStream(input, password);
+
+        String[] providersFileName = null;
+        String[] cardBaseName = null;
+        String cardName = "";
+        LocalFileHeader localFileHeader;
+        while ((localFileHeader = zipInputStream.getNextEntry()) != null) {
+            String fileName = localFileHeader.getFileName();
+            String[] nameParts = fileName.split("/");
+
+            if (providersFileName == null) {
+                providersFileName = new String[] {
+                        nameParts[0],
+                        "sync",
+                        "data",
+                        "users",
+                        nameParts[0],
+                        "analytics-properties.json"
+                };
+                cardBaseName = new String[] {
+                        nameParts[0],
+                        "sync",
+                        "data",
+                        "users",
+                        nameParts[0],
+                        "loyalty-cards"
+                };
+            }
+
+            if (startsWith(nameParts, providersFileName, 0) && !localFileHeader.isDirectory()) {
+                providers = parseProviders(zipInputStream);
+            } else if (startsWith(nameParts, cardBaseName, 1)) {
+                // Extract cardName
+                cardName = nameParts[cardBaseName.length].split("\\.", 2)[0];
+
+                // This is the card itself
+                if (nameParts.length == cardBaseName.length + 1) {
+                    // Ignore the .txt file
+                    if (fileName.endsWith(".json")) {
+                        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+
+                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                                loyaltyCardHashMap,
+                                cardName,
+                                "cardId",
+                                jsonObject.getString("input_id")
+                        );
+                        loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                                loyaltyCardHashMap,
+                                cardName,
+                                "_providerId",
+                                jsonObject
+                                    .getJSONObject("input_provider_reference")
+                                    .getString("identifier")
+                                    .substring("/loyalty-card-providers/".length())
+                        );
+
+                        try {
+                            loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                                    loyaltyCardHashMap,
+                                    cardName,
+                                    "barcodeType",
+                                    jsonObject.getString("input_barcode_format")
+                            );
+                        } catch (JSONException ignored) {}
+                    }
+                } else if (fileName.endsWith("notes/default.json")) {
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "note",
+                            ZipUtils.readJSON(zipInputStream)
+                                .getString("content")
+                    );
+                } else if (fileName.endsWith("/images/front.png")) {
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "frontImage",
+                            ZipUtils.readImage(zipInputStream)
+                    );
+                } else if (fileName.endsWith("/images/back.png")) {
+                    loyaltyCardHashMap = appendToLoyaltyCardHashMap(
+                            loyaltyCardHashMap,
+                            cardName,
+                            "backImage",
+                            ZipUtils.readImage(zipInputStream)
+                    );
+                }
+            }
+        }
+
+        if (loyaltyCardHashMap.keySet().size() == 0) {
+            throw new FormatException("Couldn't find any loyalty cards in this Stocard export.");
+        }
+
+        SQLiteDatabase database = db.getWritableDatabase();
+        database.beginTransaction();
+
+        for (HashMap<String, Object> loyaltyCardData : loyaltyCardHashMap.values()) {
+            String store = providers.get(loyaltyCardData.get("_providerId").toString());
+            String note = (String) Utils.hashmapGetOrDefault(loyaltyCardData, "note", "");
+            String cardId = (String) loyaltyCardData.get("cardId");
+            String barcodeTypeString = (String) Utils.hashmapGetOrDefault(loyaltyCardData, "barcodeType", null);
+            BarcodeFormat barcodeType = null;
+            if (barcodeTypeString != null) {
+                if (barcodeTypeString.equals("RSS_DATABAR_EXPANDED")) {
+                    barcodeType = BarcodeFormat.RSS_EXPANDED;
+                } else {
+                    barcodeType = BarcodeFormat.valueOf(barcodeTypeString);
+                }
+            }
+
+            long loyaltyCardInternalId = db.insertLoyaltyCard(database, store, note, null, BigDecimal.valueOf(0), null, cardId, null, barcodeType, null, 0);
+
+            if (loyaltyCardData.containsKey("frontImage")) {
+                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("frontImage"), (int) loyaltyCardInternalId, true);
+            }
+            if (loyaltyCardData.containsKey("backImage")) {
+                Utils.saveCardImage(context, (Bitmap) loyaltyCardData.get("backImage"), (int) loyaltyCardInternalId, false);
+            }
+        }
+
+        database.setTransactionSuccessful();
+        database.endTransaction();
+        database.close();
+
+        zipInputStream.close();
+    }
+
+    private boolean startsWith(String[] full, String[] start, int minExtraLength) {
+        if (full.length - minExtraLength < start.length) {
+            return false;
+        }
+
+        for (int i = 0; i < start.length; i++) {
+            if (!start[i].contentEquals(full[i])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private HashMap<String, HashMap<String, Object>> appendToLoyaltyCardHashMap(HashMap<String, HashMap<String, Object>> loyaltyCardHashMap, String cardID, String key, Object value) {
+        HashMap<String, Object> loyaltyCardData = loyaltyCardHashMap.get(cardID);
+        if (loyaltyCardData == null) {
+            loyaltyCardData = new HashMap<>();
+        }
+
+        loyaltyCardData.put(key, value);
+        loyaltyCardHashMap.put(cardID, loyaltyCardData);
+
+        return loyaltyCardHashMap;
+    }
+
+    private HashMap<String, String> parseProviders(ZipInputStream zipInputStream) throws IOException, JSONException {
+        // FIXME: This is probably completely wrong, but it works for the one and only test file I have
+        JSONObject jsonObject = ZipUtils.readJSON(zipInputStream);
+
+        JSONArray providerIdList = jsonObject.getJSONArray("provider_id_list");
+        JSONArray providerList = jsonObject.getJSONArray("provider_list");
+
+        // Resort, put IDs with - in them after IDs without any -
+        List<String> providerIds = new ArrayList<>();
+        List<String> customProviderIds = new ArrayList<>();
+
+        for (int i = 0; i < providerIdList.length(); i++) {
+            String providerId = providerIdList.get(i).toString();
+            if (providerId.contains("-")) {
+                customProviderIds.add(providerId);
+            } else {
+                providerIds.add(providerId);
+            }
+        }
+        providerIds.addAll(customProviderIds);
+
+        HashMap<String, String> providers = new HashMap<>();
+        for (int i = 0; i < jsonObject.getInt("number_of_cards"); i++) {
+            providers.put(providerIds.get(i), providerList.get(i).toString());
+        }
+
+        return providers;
+    }
+}
--- a/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
@@ -0,0 +1,140 @@
+package protect.card_locker.importexport;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Color;
+
+import com.google.zxing.BarcodeFormat;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Currency;
+import java.util.Date;
+import java.util.TimeZone;
+
+import protect.card_locker.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 Importer
+{
+    public void importData(Context context, DBHelper db, InputStream input, char[] password) throws IOException, FormatException, JSONException, ParseException {
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
+
+        StringBuilder sb = new StringBuilder();
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            sb.append(line);
+        }
+        JSONArray jsonArray = new JSONArray(sb.toString());
+
+        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 = new BigDecimal("0");
+            if (jsonCard.has("balanceMilliunits")) {
+                if (!jsonCard.isNull("balanceMilliunits")) {
+                    balance = new BigDecimal(String.valueOf(jsonCard.getInt("balanceMilliunits") / 1000.0));
+                }
+            } else if (!jsonCard.isNull("balance")) {
+                balance = new BigDecimal(String.valueOf(jsonCard.getDouble("balance")));
+            }
+
+            Currency balanceType = Currency.getInstance("USD");
+
+            String cardId = jsonCard.getString("code");
+
+            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 found: " + colorFromJSON);
+            }
+
+            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, null, barcodeType, headerColor, 0);
+        }
+
+        database.setTransactionSuccessful();
+        database.endTransaction();
+        database.close();
+
+        bufferedReader.close();
+    }
+}
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -2,11 +2,11 @@ package protect.card_locker.preferences;

 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+
 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
@@ -61,29 +61,34 @@ public class Settings
        return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
    }

-    public int getCardTitleListFontSize()
+    public double getFontSizeScale()
    {
-        return getInt(R.string.settings_key_card_title_list_font_size, R.integer.settings_card_title_list_font_size_sp);
+        return getInt(R.string.settings_key_max_font_size_scale, R.integer.settings_max_font_size_scale_pct) / 100.0;
    }

-    public int getCardNoteListFontSize()
+    public int getSmallFont()
    {
-        return getInt(R.string.settings_key_card_note_list_font_size, R.integer.settings_card_note_list_font_size_sp);
+        return 14;
    }

-    public int getCardTitleFontSize()
+    public int getMediumFont()
    {
-        return getInt(R.string.settings_key_card_title_font_size, R.integer.settings_card_title_font_size_sp);
+        return 28;
    }

-    public int getCardIdFontSize()
+    public int getLargeFont()
    {
-        return getInt(R.string.settings_key_card_id_font_size, R.integer.settings_card_id_font_size_sp);
+        return 40;
    }

-    public int getCardNoteFontSize()
+    public int getFontSizeMin(int fontSize)
    {
-        return getInt(R.string.settings_key_card_note_font_size, R.integer.settings_card_note_font_size_sp);
+        return (int) (Math.round(fontSize / 2.0) - 1);
+    }
+
+    public int getFontSizeMax(int fontSize)
+    {
+        return (int) Math.round(fontSize * getFontSizeScale());
    }

    public boolean useMaxBrightnessDisplayingBarcode()
@@ -95,4 +100,14 @@ public class Settings
    {
        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);
+    }
 }
--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
@@ -1,13 +1,17 @@
 package protect.card_locker.preferences;

 import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
+import android.view.MenuItem;
+
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
-import android.view.MenuItem;
-
+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
@@ -16,16 +20,17 @@ public class SettingsActivity extends AppCompatActivity
    protected void onCreate(Bundle savedInstanceState)
    {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings_activity);

        ActionBar actionBar = getSupportActionBar();
        if(actionBar != null)
        {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayHomeAsUpEnabled(true);
        }

        // Display the fragment as the main content.
-        getFragmentManager().beginTransaction()
-                .replace(android.R.id.content, new SettingsFragment())
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.settings_container, new SettingsFragment())
                .commit();
    }

@@ -43,17 +48,18 @@ public class SettingsActivity extends AppCompatActivity
        return super.onOptionsItemSelected(item);
    }

-    public static class SettingsFragment extends PreferenceFragment
+    public static class SettingsFragment extends PreferenceFragmentCompat
    {
+        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
        @Override
-        public void onCreate(final Bundle savedInstanceState)
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey)
        {
-            super.onCreate(savedInstanceState);
-
            // Load the preferences from an XML resource
            addPreferencesFromResource(R.xml.preferences);

-            findPreference(getResources().getString(R.string.settings_key_theme)).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+            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)
@@ -71,11 +77,37 @@ public class SettingsActivity extends AppCompatActivity
                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
                    }

-                    getActivity().recreate();
+                    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);
+            }
+        }
    }
 }

--- a/app/src/main/res/animator/flip_left_in.xml
+++ b/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>
--- a/app/src/main/res/animator/flip_left_out.xml
+++ b/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>
--- a/app/src/main/res/animator/flip_right_in.xml
+++ b/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>
--- a/app/src/main/res/animator/flip_right_out.xml
+++ b/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>
--- a/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_add_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_arrow_back_white.png
--- a/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_folder_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_folder_white.png
--- a/app/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_lock_outline_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_lock_outline_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_mode_edit_white_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_search_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_search_white.png
--- a/app/src/main/res/drawable-hdpi/ic_share_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_share_white.png
--- a/app/src/main/res/drawable-hdpi/ic_starred_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_starred_white.png
--- a/app/src/main/res/drawable-hdpi/ic_unstarred_white.png
+++ b/app/src/main/res/drawable-hdpi/ic_unstarred_white.png
--- a/app/src/main/res/drawable-hdpi/save_24dp.png
+++ b/app/src/main/res/drawable-hdpi/save_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_add_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_arrow_back_white.png
--- a/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_folder_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_folder_white.png
--- a/app/src/main/res/drawable-mdpi/ic_import_export_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_import_export_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_lock_open_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_lock_outline_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_lock_outline_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_mode_edit_white_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_search_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_search_white.png
--- a/app/src/main/res/drawable-mdpi/ic_share_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_share_white.png
--- a/app/src/main/res/drawable-mdpi/ic_starred_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_starred_white.png
--- a/app/src/main/res/drawable-mdpi/ic_unstarred_white.png
+++ b/app/src/main/res/drawable-mdpi/ic_unstarred_white.png
--- a/app/src/main/res/drawable-mdpi/save_24dp.png
+++ b/app/src/main/res/drawable-mdpi/save_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png
--- a/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_folder_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_folder_white.png
--- a/app/src/main/res/drawable-xhdpi/ic_import_export_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_import_export_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_lock_open_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_lock_outline_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_lock_outline_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_mode_edit_white_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_search_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_search_white.png
--- a/app/src/main/res/drawable-xhdpi/ic_share_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_share_white.png
--- a/app/src/main/res/drawable-xhdpi/ic_starred_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_starred_white.png
--- a/app/src/main/res/drawable-xhdpi/ic_unstarred_white.png
+++ b/app/src/main/res/drawable-xhdpi/ic_unstarred_white.png
--- a/app/src/main/res/drawable-xhdpi/save_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/save_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png
--- a/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":41,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]`