Fix typo in merge

.github/workflows/android.yml

@@ -1,33 +0,0 @@
-name: Android CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build
-      run: ./gradlew assembleRelease
-    - name: Check lint
-      run: ./gradlew lintRelease
-    - name: Run unit tests
-      run: ./gradlew testReleaseUnitTest
-    - name: SpotBugs
-      run: ./gradlew spotbugsRelease
-    - name: Archive test results
-      if: always()
-      uses: actions/upload-artifact@v1
-      with:
-        name: test-results
-        path: app/build/reports

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

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

.gitignore

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

.travis.yml

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

.tx/config

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+
+[loyalty-card-locker.stringsxml]
+file_filter = app/src/main/res/values-<lang>/strings.xml
+minimum_perc = 0
+source_file = app/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+

CHANGELOG.md

@@ -1,185 +1,6 @@
-# Changelog
-
-## v1.11 (2021-03-21)
-
-Changes:
-
-- Add privacy policy dialog on first start (required by Huawei)
-
-## v1.10 (2021-03-07)
-
-Changes:
-
-- Support importing [Voucher Vault](https://github.com/tim-smart/vouchervault/) exports
-- Option to keep the screen on while viewing a loyalty card
-- Option to suspend the lock screen while viewing a loyalty card
-
-## v1.9.2 (2021-02-24)
-
-Changes:
-
-- Fix parsing balance for countries using space as separator
-
-## v1.9.1 (2021-02-23)
-
-Changes:
-
-- Improve balance parsing logic
-- Fix currency decimal display on main screen
-
-## v1.9 (2021-02-22)
-
-Changes:
-
-- Add balance support
-- Reorganize barcode tab of edit view
-
-## v1.8.1 (2021-02-12)
-
-Changes:
-
-- Fix Crash on versions before Android 7
-
-## v1.8 (2021-01-28)
-
-Changes:
-
-- Add support for scaling the barcode when moving to top to fit even more small scanners
-- Fix bottom sheet jumping after switching to fullscreen
-- Make header in loyalty card view small in landscape mode
-- Fix cards not staying in group when group gets renamed
-
-## v1.7.1 (2021-01-18)
-
-Changes:
-
-- Fix crash on switching to barcode tab in edit view if there is no barcode
-
-## v1.7.0 (2021-01-18)
-
-Changes:
-
-- Separate edit UI in tabs to make it feel more spacious
-- Add expiry field support
-
-## v1.6.2 (2021-01-04)
-
-Changes:
-
-- Fix edit button or more info bottom sheet drawing over barcode ID
-
-## v1.6.1 (2020-12-16)
-
-Changes:
-
-- Fix regression causing manual barcode entry to not be saved
-
-## v1.6.0 (2020-12-15)
-
-Changes:
-
-- Automatically focus text field when creating or editing a group
-- Fix blurry icons (use SVG everywhere)
-- Always open camera but add manual scan button to camera view
-
-## v1.5.1 (2020-12-03)
-
-Changes:
-
-- Fix bottomsheet background being transparent
-
-## v1.5.0 (2020-12-03)
-
-Changes:
-
-- Improve contrast by always using white text on red buttons
-- Draggable bottom sheet in loyalty card view
-
-## v1.4.1 (2020-12-01)
-
-Changes:
-
-- Improved translations
-- Small UI fixes
-
-## v1.4.0 (2020-11-28)
-
-Changes:
-
-- Move About screen into its own activity
-- Ask user if they want to use their camera or manually enter ID on add/edit card
-- Make group ordering manual instead of forced alphabetically
-
-## v1.3.0 (2020-11-22)
-
-Changes:
-
-- Always show all import/export options and show a toast on actual issues (improves compat with XPrivacyLua)
-- Ask for confirmation when leaving edit view after making changes without saving
-
-## v1.2.2 (2020-11-19)
-
-Changes:
-
-- Remember active group tab between screens and sessions
-
-## v1.2.1 (2020-11-17)
-
-Changes:
-
-- Fix home screen swiping triggering during vertical swipes too
-
-## v1.2.0 (2020-11-17)
-
-Changes:
-
-- Add swiping between groups on the home screen
-- Fix crash with cards lacking header colour
-
-## v1.1.0 (2020-11-11)
-
-Changes:
-
-- Improved edit UI
-- Removed header text colour option (now automatically generated based on brightness)
-- Updated translations
-
-## v1.0.1 (2020-11-07)
-
-Changes:
-
-- Fix crash in search with no groups
-
-## v1.0 (2020-11-06)
-
-Changes:
-
-- Added rounded edges to card icons on main overview
-- Added support for grouping entries
-
-## v0.29 (2020-10-29)
-
-Changes:
-
-- Rebrand to Catima
-- Removed intro
-- Add floating action buttons
-- Fix Android 5 crash when opening About screen
-- Add favourites support
-- Fix disabled auto-rotate being ignored
-
-## v0.28 (2020-03-09)
-
-Changes:
-
-- Fix barcode centering when exiting full screen ([#351](https://github.com/brarcher/loyalty-card-locker/pull/351))
-- Allow backup export location to be selected ([#352](https://github.com/brarcher/loyalty-card-locker/pull/352))
-- Update translations ([#357](https://github.com/brarcher/loyalty-card-locker/pull/357)) & ([#362](https://github.com/brarcher/loyalty-card-locker/pull/362))
-
 ## v0.27 (2020-01-26)
 
 Changes:
-
 - Tapping on a barcode now moves it to the top of the screen ([#348](https://github.com/brarcher/loyalty-card-locker/pull/348))
 - Add white space around barcodes to improve scanning in dark mode ([#328](https://github.com/brarcher/loyalty-card-locker/issues/328))
 - Fix swapped import buttons. ([#346](https://github.com/brarcher/loyalty-card-locker/pull/346))
@@ -187,13 +8,11 @@ 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))
@@ -203,203 +22,178 @@ 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 ([issue #272](https://github.com/brarcher/loyalty-card-locker/issues/272))
+- Fix creating new card by manually entering barcode (https://github.com/brarcher/loyalty-card-locker/issues/272)
 
 ## v0.25 (2018-10-07)
 
 Changes:
-
-- Sort card list case insensitive ([pull #266](https://github.com/brarcher/loyalty-card-locker/pull/266))
-- Add setting to lock orientation for all cards ([pull #269](https://github.com/brarcher/loyalty-card-locker/pull/269)
+- 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)
 
 ## v0.24 (2018-07-31)
 
 Changes:
-
-- Add a setting to control screen brightness when displaying a barcode ([pull #259](https://github.com/brarcher/loyalty-card-locker/pull/259))
-- Add Greek translations ([pull #252](https://github.com/brarcher/loyalty-card-locker/pull/252))
-- Add Slovenian translations ([pull #260](https://github.com/brarcher/loyalty-card-locker/pull/260))
-- Update translations ([pull #260](https://github.com/brarcher/loyalty-card-locker/pull/260), [pull #254](https://github.com/brarcher/loyalty-card-locker/pull/254))
+- 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)
 
 ## v0.23.4 (2018-05-12)
 
-Changes:
-
-- Fix Spanish translations ([pull #244](https://github.com/brarcher/loyalty-card-locker/pull/244))
-- Update translations ([pull #244](https://github.com/brarcher/loyalty-card-locker/pull/244))
+Changes: 
+- Fix Spanish translations (https://github.com/brarcher/loyalty-card-locker/pull/244)
+- Update translations (https://github.com/brarcher/loyalty-card-locker/pull/244)
 
 ## v0.23.3 (2018-05-05)
 
 Changes:
-
 - Added translations
-  - Polish ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
-  - Spanish ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
-  - Slovak ([pull #232](https://github.com/brarcher/loyalty-card-locker/pull/232))
-- Updated translations ([pull #239](https://github.com/brarcher/loyalty-card-locker/pull/239))
+  * 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)
 
 ## v0.23.2 (2018-03-11)
 
 Changes:
-
-- Reduce min SDK from 17 to 15. ([pull #226](https://github.com/brarcher/loyalty-card-locker/pull/226))
-- Remove usage of legacy apache library, used only in unit tests but no longer needed. ([pull #225](https://github.com/brarcher/loyalty-card-locker/pull/225))
+- 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)
 
 ## v0.23.1 (2018-03-07)
 
 Changes:
-
-- Prevent crash when rendering a barcode exhausts the application's memory. ([pull #219](https://github.com/brarcher/loyalty-card-locker/pull/219))
+- Prevent crash when rendering a barcode exhausts the application's memory. (https://github.com/brarcher/loyalty-card-locker/pull/219)
 
 ## v0.23 (2018-02-28)
 
 Changes:
-
-- Reduce space in header when viewing a card. ([pull #213](https://github.com/brarcher/loyalty-card-locker/pull/213))
-- Disable beep when scanning a barcode. ([pull #216](https://github.com/brarcher/loyalty-card-locker/pull/216))
+- 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)
 
 ## v0.22 (2018-02-19)
 
 Changes:
-
-- Update translations. ([pull #208](https://github.com/brarcher/loyalty-card-locker/pull/208))
-- Barcode rendering updates: ([pull #209](https://github.com/brarcher/loyalty-card-locker/pull/209))
-  - Reload card view activity when screen is rotated, so barcode image is correct size.
-  - Render 1D barcodes in a larger space, allowing them to better fill the screen.
+- 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. 
 
 ## v0.21 (2018-02-17)
 
-Changes:
-
-- Add quiet space at the start/end of barcodes. ([pull #200](https://github.com/brarcher/loyalty-card-locker/pull/200))
-- Add options to configure the colors used for the store name font and background. ([pull #203](https://github.com/brarcher/loyalty-card-locker/pull/203))
-- Add options to adjust font sizes on the card listing page and single card page. ([pull #204](https://github.com/brarcher/loyalty-card-locker/pull/204))
+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)
 
 ## v0.20 (2018-02-10)
 
 Changes:
-
-- Changes to Card view to display the note, allow the card ID to take multiple lines, and show the store name. ([pull #197](https://github.com/brarcher/loyalty-card-locker/pull/197))
+- 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)
 
 ## v0.19 (2018-02-01)
 
 Changes:
-
-- Improved layout for card list. ([pull #188](https://github.com/brarcher/loyalty-card-locker/pull/188))
-- Improved layout when viewing a card. ([pull #190](https://github.com/brarcher/loyalty-card-locker/pull/190))
+- 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)
 
 ## v0.18.1 (2018-01-24)
 
 Changes:
-
-- Workaround crash during install on some Android versions (likely Android 5 and below). ([pull #184](https://github.com/brarcher/loyalty-card-locker/pull/184))
+- Workaround crash during install on some Android versions (likely Android 5 and below). (https://github.com/brarcher/loyalty-card-locker/pull/184)
 
 ## v0.18 (2018-01-19)
 
 Changes:
-
-- Fix crash when importing certain types of corrupted CSV files. ([pull #177](https://github.com/brarcher/loyalty-card-locker/pull/177))
-- Fix importing backups directly from the file system. ([pull #180](https://github.com/brarcher/loyalty-card-locker/pull/180))
-- Fix importing backups from certain types of content providers. ([pull #179](https://github.com/brarcher/loyalty-card-locker/pull/179))
+- 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)
 
 ## v0.17 (2018-01-11)
 
 Changes:
-
-- Fix issue on Android SDK 24+ where using the file chooser import option would cause a crash. ([pull #170](https://github.com/brarcher/loyalty-card-locker/pull/170))
-- New icon and color scheme. ([pull #171](https://github.com/brarcher/loyalty-card-locker/pull/171))
+- 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)
 
 ## v0.16 (2017-11-29)
 
 Changes:
-
-- Add support for adding loyalty card shortcuts from the launcher/homescreen. ([pull #161](https://github.com/brarcher/loyalty-card-locker/pull/161))
-- Remove support for adding loyalty card shortcuts from the app itself. This removes the need for the shortcut permission. ([pull #163](https://github.com/brarcher/loyalty-card-locker/pull/163))
+- 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)
 
 ## v0.15 (2017-11-25)
 
 Changes:
-
-- Add support for adding shortcuts to home screen when adding or editing a card. ([pull #155](https://github.com/brarcher/loyalty-card-locker/pull/155))
-- Remove widget, as it was a poor substitute for shortcuts. ([pull #155](https://github.com/brarcher/loyalty-card-locker/pull/155))
-- Fix exporting backups on Android 7+. ([pull #153](https://github.com/brarcher/loyalty-card-locker/pull/153))
-- Report more accurate mime type when exporting backup data. ([pull #156](https://github.com/brarcher/loyalty-card-locker/pull/156))
-- Fix bug where a card could not be edited. ([pull #155](https://github.com/brarcher/loyalty-card-locker/pull/155))
+- 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)
 
 ## v0.14 (2017-10-26)
 
 Changes:
-
-- 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))
+- 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)
 
 ## 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. ([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))
+- 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)
 
 ## 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. ([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))
+- 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)
 
 ## 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. ([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))
+- 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)
 
 ## v0.10 (2017-02-12)
 
 Improvements:
-
-- 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))
+- 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)
 
 ## v0.9 (2017-01-17)
 
@@ -407,50 +201,43 @@ 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. ([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))
+- 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)
 
 ## 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. ([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))
+- 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)
 
 ## v0.7 (2016-07-14)
 
 New features/improvements:
-
-- 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))
+- Long-click of a card brings up option to copy card ID to the clipboard. (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. [issue #33](https://github.com/brarcher/loyalty-card-locker/issues/33), [pull #44](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. https://github.com/brarcher/loyalty-card-locker/issues/33, https://github.com/brarcher/loyalty-card-locker/pull/44 
 
 Bug fixes:
-
-- Resolve issue where some displayed barcodes were blurry. ([issue #37](https://github.com/brarcher/loyalty-card-locker/issues/37))
+- Resolve issue where some displayed barcodes were blurry. (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 ([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))
+- 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)
 
 ## 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
@@ -462,18 +249,17 @@ 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)
@@ -482,6 +268,7 @@ 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

Gemfile

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

Gemfile.lock

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

app/.gitignore

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

app/build.gradle

@@ -1,97 +1,73 @@
-import com.github.spotbugs.snom.SpotBugsTask
-
 apply plugin: 'com.android.application'
-apply plugin: 'com.github.spotbugs'
+apply plugin: 'findbugs'
 
-spotbugs {
+findbugs {
+    sourceSets = []
     ignoreFailures = false
-    effort = 'max'
-    excludeFilter = file("./config/spotbugs/exclude.xml")
-    reportsDir = file("$buildDir/reports/spotbugs/")
 }
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        applicationId "me.hackerchick.catima"
-        minSdkVersion 19
+        applicationId "protect.card_locker"
+        minSdkVersion 16
         targetSdkVersion 29
-        versionCode 64
-        versionName "1.11"
-
-        vectorDrawables.useSupportLibrary true
+        versionCode 38
+        versionName "0.27"
     }
-
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            resValue "string", "app_name", "Catima"
-        }
-        debug {
-            applicationIdSuffix ".debug"
-            resValue "string", "app_name", "Catima Debug"
         }
     }
-
-    compileOptions {
-        encoding "UTF-8"
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     lintOptions {
-        disable "GoogleAppIndexingWarning", "ButtonStyle", "AlwaysShowAction",
-                "MissingTranslation", "MissingPrefix"
+        disable "GoogleAppIndexingWarning"
+        disable "ButtonStyle"
+        disable "AlwaysShowAction"
+        disable "MissingTranslation"
+        disable "MissingPrefix"
     }
 
     // Starting with Android Studio 3 Robolectric is unable to find resources.
     // The following allows it to find the resources.
     testOptions {
         unitTests {
-            all {
-                testLogging {
-                    events 'started', 'passed', 'skipped', 'failed'
-                }
-            }
-            includeAndroidResources true
+            includeAndroidResources = true
         }
     }
 }
 
 dependencies {
-// AndroidX
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
-
-// Third-party
-    implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
-    implementation 'com.google.zxing:core:3.3.3' // Do not upgrade past 3.3.3! Causes a crash on versions before Android 7
-    implementation 'org.apache.commons:commons-csv:1.8'
-    implementation 'com.jaredrummler:colorpicker:1.1.0'
-    implementation 'com.google.guava:guava:30.1-jre'
-    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.1'
-
-// Testing
-    testImplementation 'androidx.test:core:1.0.0'
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.robolectric:robolectric:4.4'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'androidx.appcompat:appcompat:1.2.0-alpha01'
+    compile 'com.google.android.material:material:1.2.0-alpha03'
+    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"
+    testCompile 'junit:junit:4.12'
+    testCompile "org.robolectric:robolectric:4.0.2"
 }
 
-tasks.withType(SpotBugsTask) {
+task findbugs(type: FindBugs, dependsOn: 'assembleDebug') {
 
-    description 'Run spotbugs'
+    description 'Run findbugs'
     group 'verification'
 
-    //classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
-    //source = fileTree('src/main/java')
-    //classpath = files()
+    classes = fileTree('build/intermediates/javac/debug/compileDebugJavaWithJavac/classes')
+    source = fileTree('src/main/java')
+    classpath = files()
+
+    effort = 'max'
+
+    excludeFilter = file("./config/findbugs/exclude.xml")
 
     reports {
         xml.enabled = false

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

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

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="protect.card_locker"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission
         android:name="android.permission.CAMERA"/>
@@ -17,8 +16,6 @@
         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"
@@ -36,27 +33,19 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".AboutActivity"
-            android:label="@string/about"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
-        <activity
-            android:name=".ManageGroupsActivity"
-            android:label="@string/groups"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
         <activity
             android:name=".LoyaltyCardViewActivity"
             android:theme="@style/AppTheme.NoActionBar"
+            android:label=""
             android:windowSoftInputMode="stateHidden"
             android:exported="true"/>
         <activity
             android:name=".LoyaltyCardEditActivity"
             android:theme="@style/AppTheme.NoActionBar"
+            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"
             android:exported="true">
-            <intent-filter android:label="@string/app_name">
+            <intent-filter android:label="@string/intent_import_card_from_url">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -64,30 +53,32 @@
                 <data android:scheme="https"
                     android:host="@string/intent_import_card_from_url_host"
                     android:pathPrefix="@string/intent_import_card_from_url_path_prefix" />
-                <data android:scheme="https"
-                    android:host="@string/intent_import_card_from_url_host_old"
-                    android:pathPrefix="@string/intent_import_card_from_url_path_prefix_old" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ScanActivity"
-            android:label="@string/scanCardBarcode"
-            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".BarcodeSelectorActivity"
             android:label="@string/selectBarcodeTitle"
             android:theme="@style/AppTheme.NoActionBar"
+            android:configChanges="orientation|screenSize"
             android:windowSoftInputMode="stateHidden"/>
         <activity
             android:name=".preferences.SettingsActivity"
-            android:label="@string/settings"/>
+            android:label="@string/settings"
+            android:configChanges="orientation|screenSize"/>
         <activity
             android:name=".ImportExportActivity"
             android:label="@string/importExport"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/AppTheme.NoActionBar"/>
+        <activity
+            android:name=".intro.IntroActivity"
+            android:label=""
+            android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".CardShortcutConfigure"
             android:label="@string/cardShortcut"
+            android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT"/>

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

@@ -1,111 +0,0 @@
-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 com.google.common.collect.ImmutableMap;
-
-import java.util.Calendar;
-import java.util.Map;
-
-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 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("Color Picker", "https://github.com/jaredrummler/ColorPicker")
-                .put("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference")
-                .build();
-
-        final Map<String, String> USED_ASSETS = ImmutableMap.of
-                (
-                        "Android icons", "https://www.apache.org/licenses/LICENSE-2.0.txt"
-                );
-
-        StringBuilder libs = new StringBuilder().append("<br/>");
-        for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
-        {
-            libs.append("<br/><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a><br/>");
-        }
-
-        StringBuilder resources = new StringBuilder().append("<br/>");
-        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
-        {
-            resources.append("<br/><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a><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), appName, libs.toString()) +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_resources), appName, resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        int id = item.getItemId();
-
-        if (id == android.R.id.home) {
-            finish();
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-}

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

@@ -5,7 +5,6 @@ import android.os.AsyncTask;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.MultiFormatWriter;
@@ -21,7 +20,7 @@ import java.lang.ref.WeakReference;
  */
 class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     // When drawn in a smaller window 1D barcodes for some reason end up
     // squished, whereas 2D barcodes look fine.
@@ -29,18 +28,16 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
     private static final int MAX_WIDTH_2D = 500;
 
     private final WeakReference<ImageView> imageViewReference;
-    private final WeakReference<TextView> textViewReference;
     private final String cardId;
     private final BarcodeFormat format;
     private final int imageHeight;
     private final int imageWidth;
 
     BarcodeImageWriterTask(ImageView imageView, String cardIdString,
-                           BarcodeFormat barcodeFormat, TextView textView)
+                                  BarcodeFormat barcodeFormat)
     {
         // Use a WeakReference to ensure the ImageView can be garbage collected
         imageViewReference = new WeakReference<>(imageView);
-        textViewReference = new WeakReference<>(textView);
 
         cardId = cardIdString;
         format = barcodeFormat;
@@ -61,11 +58,6 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
-    BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
-    {
-        this(imageView, cardIdString, barcodeFormat, null);
-    }
-
     private int getMaxWidth(BarcodeFormat format)
     {
         switch(format)
@@ -183,25 +175,16 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
 
         imageView.setImageBitmap(result);
-        TextView textView = textViewReference.get();
 
         if(result != null)
         {
             Log.i(TAG, "Displaying barcode");
             imageView.setVisibility(View.VISIBLE);
-
-            if (textView != null) {
-                textView.setVisibility(View.VISIBLE);
-                textView.setText(format.name());
-            }
         }
         else
         {
             Log.i(TAG, "Barcode generation failed, removing image from display");
             imageView.setVisibility(View.GONE);
-            if (textView != null) {
-                textView.setVisibility(View.GONE);
-            }
         }
     }
 }

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

@@ -3,6 +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;
@@ -10,13 +11,11 @@ import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
-import android.util.Pair;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.zxing.BarcodeFormat;
@@ -35,7 +34,7 @@ import java.util.Map;
  */
 public class BarcodeSelectorActivity extends AppCompatActivity
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     // Result this activity will return
     public static final String BARCODE_CONTENTS = "contents";
@@ -59,7 +58,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 BarcodeFormat.UPC_A.name()
         ));
 
-    private Map<String, Pair<Integer, Integer>> barcodeViewMap;
+    private Map<String, Integer> barcodeViewMap;
     private LinkedList<AsyncTask> barcodeGeneratorTasks = new LinkedList<>();
 
     @Override
@@ -76,18 +75,18 @@ public class BarcodeSelectorActivity extends AppCompatActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        barcodeViewMap = ImmutableMap.<String, Pair<Integer, Integer>>builder()
-                .put(BarcodeFormat.AZTEC.name(), new Pair<>(R.id.aztecBarcode, R.id.aztecBarcodeText))
-                .put(BarcodeFormat.CODE_39.name(), new Pair<>(R.id.code39Barcode, R.id.code39BarcodeText))
-                .put(BarcodeFormat.CODE_128.name(), new Pair<>(R.id.code128Barcode, R.id.code128BarcodeText))
-                .put(BarcodeFormat.CODABAR.name(), new Pair<>(R.id.codabarBarcode, R.id.codabarBarcodeText))
-                .put(BarcodeFormat.DATA_MATRIX.name(), new Pair<>(R.id.datamatrixBarcode, R.id.datamatrixBarcodeText))
-                .put(BarcodeFormat.EAN_8.name(), new Pair<>(R.id.ean8Barcode, R.id.ean8BarcodeText))
-                .put(BarcodeFormat.EAN_13.name(), new Pair<>(R.id.ean13Barcode, R.id.ean13BarcodeText))
-                .put(BarcodeFormat.ITF.name(), new Pair<>(R.id.itfBarcode, R.id.itfBarcodeText))
-                .put(BarcodeFormat.PDF_417.name(), new Pair<>(R.id.pdf417Barcode, R.id.pdf417BarcodeText))
-                .put(BarcodeFormat.QR_CODE.name(), new Pair<>(R.id.qrcodeBarcode, R.id.qrcodeBarcodeText))
-                .put(BarcodeFormat.UPC_A.name(), new Pair<>(R.id.upcaBarcode, R.id.upcaBarcodeText))
+        barcodeViewMap = ImmutableMap.<String, Integer>builder()
+                .put(BarcodeFormat.AZTEC.name(), R.id.aztecBarcode)
+                .put(BarcodeFormat.CODE_39.name(), R.id.code39Barcode)
+                .put(BarcodeFormat.CODE_128.name(), R.id.code128Barcode)
+                .put(BarcodeFormat.CODABAR.name(), R.id.codabarBarcode)
+                .put(BarcodeFormat.DATA_MATRIX.name(), R.id.datamatrixBarcode)
+                .put(BarcodeFormat.EAN_8.name(), R.id.ean8Barcode)
+                .put(BarcodeFormat.EAN_13.name(), R.id.ean13Barcode)
+                .put(BarcodeFormat.ITF.name(), R.id.itfBarcode)
+                .put(BarcodeFormat.PDF_417.name(), R.id.pdf417Barcode)
+                .put(BarcodeFormat.QR_CODE.name(), R.id.qrcodeBarcode)
+                .put(BarcodeFormat.UPC_A.name(), R.id.upcaBarcode)
                 .build();
 
         EditText cardId = findViewById(R.id.cardId);
@@ -114,9 +113,8 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                 // 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);
+                    ImageView image = findViewById(barcodeViewMap.get(key));
+                    createBarcodeOption(image, key, s.toString());
                 }
 
                 View noBarcodeButtonView = findViewById(R.id.noBarcode);
@@ -155,7 +153,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
         });
     }
 
-    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId, final TextView text)
+    private void createBarcodeOption(final ImageView image, final String formatType, final String cardId)
     {
         final BarcodeFormat format = BarcodeFormat.valueOf(formatType);
         if(format == null)
@@ -190,10 +188,17 @@ public class BarcodeSelectorActivity extends AppCompatActivity
                     public void onGlobalLayout()
                     {
                         Log.d(TAG, "Global layout finished, type: + " + formatType + ", width: " + image.getWidth());
-                        image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                        if (Build.VERSION.SDK_INT < 16)
+                        {
+                            image.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                        }
+                        else
+                        {
+                            image.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                        }
 
                         Log.d(TAG, "Generating barcode for type " + formatType);
-                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format, text);
+                        BarcodeImageWriterTask task = new BarcodeImageWriterTask(image, cardId, format);
                         barcodeGeneratorTasks.add(task);
                         task.execute();
                     }
@@ -202,7 +207,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);
             barcodeGeneratorTasks.add(task);
             task.execute();
         }

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

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

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

@@ -17,7 +17,7 @@ import android.widget.Toast;
  */
 public class CardShortcutConfigure extends AppCompatActivity
 {
-    static final String TAG = "Catima";
+    static final String TAG = "LoyaltyCardLocker";
 
     @Override
     public void onCreate(Bundle bundle)

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

@@ -0,0 +1,54 @@
+package protect.card_locker;
+
+import android.database.Cursor;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVPrinter;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+
+/**
+ * Class for exporting the database into CSV (Comma Separate Values)
+ * format.
+ */
+public class CsvDatabaseExporter implements DatabaseExporter
+{
+    public void exportData(DBHelper db, OutputStreamWriter output) throws IOException, InterruptedException
+    {
+        CSVPrinter printer = new CSVPrinter(output, CSVFormat.RFC4180);
+
+        // Print the header
+        printer.printRecord(DBHelper.LoyaltyCardDbIds.ID,
+                DBHelper.LoyaltyCardDbIds.STORE,
+                DBHelper.LoyaltyCardDbIds.NOTE,
+                DBHelper.LoyaltyCardDbIds.CARD_ID,
+                DBHelper.LoyaltyCardDbIds.HEADER_COLOR,
+                DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR,
+                DBHelper.LoyaltyCardDbIds.BARCODE_TYPE);
+
+        Cursor cursor = db.getLoyaltyCardCursor();
+
+        while(cursor.moveToNext())
+        {
+            LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cursor);
+
+            printer.printRecord(card.id,
+                    card.store,
+                    card.note,
+                    card.cardId,
+                    card.headerColor,
+                    card.headerTextColor,
+                    card.barcodeType);
+
+            if(Thread.currentThread().isInterrupted())
+            {
+                throw new InterruptedException();
+            }
+        }
+
+        cursor.close();
+
+        printer.close();
+    }
+}

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

@@ -0,0 +1,147 @@
+package protect.card_locker;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Class for importing a database from CSV (Comma Separate Values)
+ * formatted data.
+ *
+ * The database's loyalty cards are expected to appear in the CSV data.
+ * A header is expected for the each table showing the names of the columns.
+ */
+public class CsvDatabaseImporter implements DatabaseImporter
+{
+    public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException
+    {
+        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.withHeader());
+
+        SQLiteDatabase database = db.getWritableDatabase();
+        database.beginTransaction();
+
+        try
+        {
+            for (CSVRecord record : parser)
+            {
+                importLoyaltyCard(database, db, record);
+
+                if(Thread.currentThread().isInterrupted())
+                {
+                    throw new InterruptedException();
+                }
+            }
+
+            parser.close();
+            database.setTransactionSuccessful();
+        }
+        catch(IllegalArgumentException|IllegalStateException e)
+        {
+            throw new FormatException("Issue parsing CSV data", e);
+        }
+        finally
+        {
+            database.endTransaction();
+            database.close();
+        }
+    }
+
+    /**
+     * Extract a string from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, defaultValue is returned
+     * if it is not null. Otherwise, a FormatException is thrown.
+     */
+    private String extractString(String key, CSVRecord record, String defaultValue)
+            throws FormatException
+    {
+        String toReturn = defaultValue;
+
+        if(record.isMapped(key))
+        {
+            toReturn = record.get(key);
+        }
+        else
+        {
+            if(defaultValue == null)
+            {
+                throw new FormatException("Field not used but expected: " + key);
+            }
+        }
+
+        return toReturn;
+    }
+
+    /**
+     * Extract an integer from the items array. The index into the array
+     * is determined by looking up the index in the fields map using the
+     * "key" as the key. If no such key exists, or the data is not a valid
+     * int, a FormatException is thrown.
+     */
+    private Integer extractInt(String key, CSVRecord record, boolean nullIsOk)
+            throws FormatException
+    {
+        if(record.isMapped(key) == false)
+        {
+            throw new FormatException("Field not used but expected: " + key);
+        }
+
+        String value = record.get(key);
+        if(value.isEmpty() && nullIsOk)
+        {
+            return null;
+        }
+
+        try
+        {
+            return Integer.parseInt(record.get(key));
+        }
+        catch(NumberFormatException e)
+        {
+            throw new FormatException("Failed to parse field: " + key, e);
+        }
+    }
+
+    /**
+     * Import a single loyalty card into the database using the given
+     * session.
+     */
+    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
+            throws IOException, FormatException
+    {
+        int id = extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
+
+        String store = extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
+        if(store.isEmpty())
+        {
+            throw new FormatException("No store listed, but is required");
+        }
+
+        String note = extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
+
+        String cardId = extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
+        if(cardId.isEmpty())
+        {
+            throw new FormatException("No card ID listed, but is required");
+        }
+
+        String barcodeType = extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
+
+        Integer headerColor = null;
+        Integer headerTextColor = null;
+
+        if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR) &&
+           record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR))
+        {
+            headerColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
+            headerTextColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR, record, true);
+        }
+
+        helper.insertLoyaltyCard(database, id, store, note, cardId, barcodeType, headerColor, headerTextColor);
+    }
+}

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

@@ -1,53 +1,31 @@
 package protect.card_locker;
 
+
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.graphics.Color;
 
-import java.math.BigDecimal;
-import java.util.Currency;
-import java.util.Date;
 import java.util.ArrayList;
 import java.util.List;
 
 public class DBHelper extends SQLiteOpenHelper
 {
-    public static final String DATABASE_NAME = "Catima.db";
+    public static final String DATABASE_NAME = "LoyaltyCards.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 8;
+    public static final int DATABASE_VERSION = 3;
 
-    public static class LoyaltyCardDbGroups
-    {
-        public static final String TABLE = "groups";
-        public static final String ID = "_id";
-        public static final String ORDER = "orderId";
-    }
-
-    public static class LoyaltyCardDbIds
+    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_TYPE = "barcodetype";
-        public static final String STAR_STATUS = "starstatus";
-    }
-
-    public static class LoyaltyCardDbIdsGroups
-    {
-        public static final String TABLE = "cardsGroups";
-        public static final String cardID = "cardId";
-        public static final String groupID = "groupId";
     }
 
     public DBHelper(Context context)
@@ -58,31 +36,15 @@ public class DBHelper extends SQLiteOpenHelper
     @Override
     public void onCreate(SQLiteDatabase db)
     {
-        // create table for card groups
-        db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
-                LoyaltyCardDbGroups.ID + " TEXT primary key not null," +
-                LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0')");
-
-        // create table for cards
-        // Balance is TEXT and not REAL to be able to store a BigDecimal without precision loss
+        // create table for gift cards
         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' )");
-
-        // create associative table for cards in groups
-        db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
-                LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
-                LoyaltyCardDbIdsGroups.groupID + " TEXT," +
-                "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
+                LoyaltyCardDbIds.BARCODE_TYPE + " TEXT not null)");
     }
 
     @Override
@@ -103,118 +65,54 @@ public class DBHelper extends SQLiteOpenHelper
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
         }
-
-        // Upgrade from version 3 to version 4
-        if(oldVersion < 4 && newVersion >= 4)
-        {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'");
-        }
-
-        // Upgrade from version 4 to version 5
-        if(oldVersion < 5 && newVersion >= 5)
-        {
-            db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
-                    LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
-
-            db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
-                    LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
-                    LoyaltyCardDbIdsGroups.groupID + " TEXT," +
-                    "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
-        }
-
-        // Upgrade from version 5 to 6
-        if(oldVersion < 6 && newVersion >= 6)
-        {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbGroups.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0'");
-        }
-
-        if(oldVersion < 7 && newVersion >= 7)
-        {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.EXPIRY + " INTEGER");
-        }
-
-        if(oldVersion < 8 && newVersion >= 8)
-        {
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.BALANCE + " TEXT not null DEFAULT '0'");
-            db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
-                    + " ADD COLUMN " + LoyaltyCardDbIds.BALANCE_TYPE + " TEXT");
-        }
     }
 
-    public long insertLoyaltyCard(final String store, final String note, final Date expiry,
-                                  final BigDecimal balance, final Currency balanceType,
-                                  final String cardId, final String barcodeType,
-                                  final Integer headerColor, final int starStatus)
+    public long insertLoyaltyCard(final String store, final String note, final String cardId,
+                                  final String barcodeType, final Integer headerColor,
+                                  final Integer headerTextColor)
     {
         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.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, Color.WHITE);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
         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 Date expiry, final BigDecimal balance,
-                                     final Currency balanceType, final String cardId,
+    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)
+                                     final Integer headerTextColor)
     {
         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.HEADER_COLOR, headerColor);
-        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, Color.WHITE);
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
         final long newId = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
         return (newId != -1);
     }
 
+
     public boolean updateLoyaltyCard(final int id, final String store, final String note,
-                                     final Date expiry, final BigDecimal balance,
-                                     final Currency balanceType, final String cardId,
-                                     final String barcodeType, final Integer headerColor)
+                                     final String cardId, final String barcodeType,
+                                     final Integer headerColor, final Integer headerTextColor)
     {
         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.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)});
-        return (rowsUpdated == 1);
-    }
-
-    public boolean updateLoyaltyCardStarStatus(final int id, final int starStatus)
-    {
-        SQLiteDatabase db = getWritableDatabase();
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbIds.STAR_STATUS,starStatus);
+        contentValues.put(LoyaltyCardDbIds.HEADER_TEXT_COLOR, headerTextColor);
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
                 LoyaltyCardDbIds.ID + "=?",
                 new String[]{Integer.toString(id)});
@@ -232,7 +130,6 @@ public class DBHelper extends SQLiteOpenHelper
         if(data.getCount() == 1)
         {
             data.moveToFirst();
-
             card = LoyaltyCard.toLoyaltyCard(data);
         }
 
@@ -241,79 +138,12 @@ public class DBHelper extends SQLiteOpenHelper
         return card;
     }
 
-    public List<Group> getLoyaltyCardGroups(final int id)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE + " g " +
-                " LEFT JOIN " + LoyaltyCardDbIdsGroups.TABLE + " ig ON ig." + LoyaltyCardDbIdsGroups.groupID + " = g." + LoyaltyCardDbGroups.ID +
-                " where " + LoyaltyCardDbIdsGroups.cardID + "=?" +
-                " ORDER BY " + LoyaltyCardDbIdsGroups.groupID, new String[]{String.format("%d", id)});
-
-        List<Group> groups = new ArrayList<>();
-
-        if (!data.moveToFirst()) {
-            data.close();
-            return groups;
-        }
-
-        groups.add(Group.toGroup(data));
-
-        while (data.moveToNext()) {
-            groups.add(Group.toGroup(data));
-        }
-
-        data.close();
-
-        return groups;
-    }
-
-    public void setLoyaltyCardGroups(final int id, List<Group> groups)
-    {
-        SQLiteDatabase db = getWritableDatabase();
-
-        // First delete lookup table entries associated with this card
-        db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                LoyaltyCardDbIdsGroups.cardID + " = ? ",
-                new String[]{String.format("%d", id)});
-
-        // Then create entries for selected values
-        for (Group group : groups) {
-            ContentValues contentValues = new ContentValues();
-            contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
-            contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
-            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
-        }
-    }
-
-    public void setLoyaltyCardGroups(final SQLiteDatabase db, final int id, List<Group> groups)
-    {
-        // First delete lookup table entries associated with this card
-        db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                LoyaltyCardDbIdsGroups.cardID + " = ? ",
-                new String[]{String.format("%d", id)});
-
-        // Then create entries for selected values
-        for (Group group : groups) {
-            ContentValues contentValues = new ContentValues();
-            contentValues.put(LoyaltyCardDbIdsGroups.cardID, id);
-            contentValues.put(LoyaltyCardDbIdsGroups.groupID, group._id);
-            db.insert(LoyaltyCardDbIdsGroups.TABLE, null, contentValues);
-        }
-    }
-
     public boolean deleteLoyaltyCard (final int id)
     {
         SQLiteDatabase db = getWritableDatabase();
-        // Delete card
-        int rowsDeleted = db.delete(LoyaltyCardDbIds.TABLE,
+        int rowsDeleted =  db.delete(LoyaltyCardDbIds.TABLE,
                 LoyaltyCardDbIds.ID + " = ? ",
                 new String[]{String.format("%d", id)});
-
-        // And delete lookup table entries associated with this card
-        db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                LoyaltyCardDbIdsGroups.cardID + " = ? ",
-                new String[]{String.format("%d", id)});
-
         return (rowsDeleted == 1);
     }
 
@@ -330,55 +160,70 @@ public class DBHelper extends SQLiteOpenHelper
      * @return Cursor
      */
     public Cursor getLoyaltyCardCursor(final String filter)
-    {
-        return getLoyaltyCardCursor(filter, null);
-    }
-
-    /**
-     * Returns a cursor to all loyalty cards with the filter text in either the store or note in a certain group.
-     *
-     * @param filter
-     * @param group
-     * @return Cursor
-     */
-    public Cursor getLoyaltyCardCursor(final String filter, Group group)
     {
         String actualFilter = String.format("%%%s%%", filter);
         String[] selectionArgs = { actualFilter, actualFilter };
-        StringBuilder groupFilter = new StringBuilder();
-        String limitString = "";
 
         SQLiteDatabase db = getReadableDatabase();
 
-        if (group != null) {
-            List<Integer> allowedIds = getGroupCardIds(group._id);
+        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
+                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? " +
+                " ORDER BY " + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
+        return res;
+    }
 
-            // Empty group
-            if (allowedIds.size() > 0) {
-                groupFilter.append("AND (");
+    /**
+     * Returns a cursor only containing the first loyalty card of the given store.
+     *
+     * @param filter
+     * @return Cursor
+     */
+    public Cursor getOneLoyaltyCardPerStoreCursor(final String filter)
+    {
+        String actualFilter = String.format("%%%s%%", filter);
+        String[] selectionArgs = { actualFilter, actualFilter };
 
-                for (int i = 0; i < allowedIds.size(); i++) {
-                    groupFilter.append(LoyaltyCardDbIds.ID + " = " + allowedIds.get(i));
-                    if (i != allowedIds.size() - 1) {
-                        groupFilter.append(" OR ");
-                    }
-                }
-                groupFilter.append(") ");
-            } else {
-                limitString = "LIMIT 0";
-            }
-        }
+        SQLiteDatabase db = getReadableDatabase();
 
         Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
-                " WHERE (" + LoyaltyCardDbIds.STORE + "  LIKE ? " +
-                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? )" +
-                groupFilter.toString() +
-                " ORDER BY " + LoyaltyCardDbIds.STAR_STATUS + " DESC," + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
-                limitString, selectionArgs, null);
-
+                " WHERE " + LoyaltyCardDbIds.STORE + "  LIKE ? " +
+                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? " +
+                " GROUP BY " + LoyaltyCardDbIds.STORE +
+                " HAVING MIN(" + LoyaltyCardDbIds.ID + ")" +
+                " ORDER BY " + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
         return res;
     }
 
+    /**
+     * Returns a list of all loyalty cards of the given store.
+     *
+     * @param store
+     * @return List<LoyaltyCard>
+     */
+    public List<LoyaltyCard> getLoyaltyCardsForStore(String store)
+    {
+        List<LoyaltyCard> loyaltyCards = new ArrayList<>();
+
+        SQLiteDatabase db = getReadableDatabase();
+        String[] selectionArgs = { store };
+
+        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
+                " WHERE " + LoyaltyCardDbIds.STORE + "  IS ? " +
+                " ORDER BY " + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", selectionArgs, null);
+
+        try
+        {
+            while (res.moveToNext()) {
+                loyaltyCards.add(LoyaltyCard.toLoyaltyCard(res));
+            }
+        } finally {
+            res.close();
+        }
+
+        return loyaltyCards;
+    }
+
     public int getLoyaltyCardCount()
     {
         // An empty string will match everything
@@ -414,230 +259,5 @@ public class DBHelper extends SQLiteOpenHelper
 
         return numItems;
     }
-
-    /**
-     * Returns a cursor to all groups.
-     *
-     * @return Cursor
-     */
-    public Cursor getGroupCursor()
-    {
-        SQLiteDatabase db = getReadableDatabase();
-
-        Cursor res = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
-                " ORDER BY " + LoyaltyCardDbGroups.ORDER + " ASC," + LoyaltyCardDbGroups.ID + " COLLATE NOCASE ASC", null, null);
-        return res;
-    }
-
-    public List<Group> getGroups() {
-        Cursor data = getGroupCursor();
-
-        List<Group> groups = new ArrayList<>();
-
-        if (!data.moveToFirst()) {
-            data.close();
-            return groups;
-        }
-
-        groups.add(Group.toGroup(data));
-
-        while (data.moveToNext()) {
-            groups.add(Group.toGroup(data));
-        }
-
-        data.close();
-
-        return groups;
-    }
-
-    public void reorderGroups(final List<Group> groups)
-    {
-        Integer order = 0;
-
-        SQLiteDatabase db = getWritableDatabase();
-        ContentValues contentValues;
-
-        for (Group group : groups)
-        {
-            contentValues = new ContentValues();
-            contentValues.put(LoyaltyCardDbGroups.ORDER, order);
-
-            db.update(LoyaltyCardDbGroups.TABLE, contentValues,
-                    LoyaltyCardDbGroups.ID + "=?",
-                    new String[]{group._id});
-
-            order++;
-        }
-    }
-
-    public Group getGroup(final String groupName)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data = db.rawQuery("select * from " + LoyaltyCardDbGroups.TABLE +
-                " where " + LoyaltyCardDbGroups.ID + "=?", new String[]{groupName});
-
-        Group group = null;
-
-        if(data.getCount() == 1)
-        {
-            data.moveToFirst();
-
-            group = Group.toGroup(data);
-        }
-
-        data.close();
-
-        return group;
-    }
-
-    public int getGroupCount()
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbGroups.TABLE, null);
-
-        int numItems = 0;
-
-        if(data.getCount() == 1)
-        {
-            data.moveToFirst();
-            numItems = data.getInt(0);
-        }
-
-        data.close();
-
-        return numItems;
-    }
-
-    public List<Integer> getGroupCardIds(final String groupName)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-        Cursor data =  db.rawQuery("SELECT " + LoyaltyCardDbIdsGroups.cardID +
-                " FROM " + LoyaltyCardDbIdsGroups.TABLE +
-                " WHERE " + LoyaltyCardDbIdsGroups.groupID + " =? ", new String[]{groupName});
-
-        List<Integer> cardIds = new ArrayList<>();
-
-        if (!data.moveToFirst()) {
-            return cardIds;
-        }
-
-        cardIds.add(data.getInt(0));
-
-        while (data.moveToNext()) {
-            cardIds.add(data.getInt(0));
-        }
-
-        data.close();
-
-        return cardIds;
-    }
-
-    public long insertGroup(final String name)
-    {
-        if (name.isEmpty()) return -1;
-
-        SQLiteDatabase db = getWritableDatabase();
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbGroups.ID, name);
-        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
-        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
-        return newId;
-    }
-
-    public boolean insertGroup(final SQLiteDatabase db, final String name)
-    {
-        ContentValues contentValues = new ContentValues();
-        contentValues.put(LoyaltyCardDbGroups.ID, name);
-        contentValues.put(LoyaltyCardDbGroups.ORDER, getGroupCount());
-        final long newId = db.insert(LoyaltyCardDbGroups.TABLE, null, contentValues);
-        return (newId != -1);
-    }
-
-    public boolean updateGroup(final String groupName, final String newName)
-    {
-        if (newName.isEmpty()) return false;
-
-        boolean success = false;
-
-        SQLiteDatabase db = getWritableDatabase();
-        ContentValues groupContentValues = new ContentValues();
-        groupContentValues.put(LoyaltyCardDbGroups.ID, newName);
-
-        ContentValues lookupContentValues = new ContentValues();
-        lookupContentValues.put(LoyaltyCardDbIdsGroups.groupID, newName);
-
-        db.beginTransaction();
-        try {
-            // Update group name
-            int groupsChanged = db.update(LoyaltyCardDbGroups.TABLE, groupContentValues,
-                    LoyaltyCardDbGroups.ID + "=?",
-                    new String[]{groupName});
-
-            // Also update lookup tables
-            db.update(LoyaltyCardDbIdsGroups.TABLE, lookupContentValues,
-                    LoyaltyCardDbIdsGroups.groupID + "=?",
-                    new String[]{groupName});
-
-            if (groupsChanged == 1) {
-                db.setTransactionSuccessful();
-                success = true;
-            }
-        } catch (SQLiteException e) {
-        } finally {
-            db.endTransaction();
-        }
-
-        return success;
-    }
-
-    public boolean deleteGroup(final String groupName)
-    {
-        boolean success = false;
-
-        SQLiteDatabase db = getWritableDatabase();
-
-        db.beginTransaction();
-        try {
-            // Delete group
-            int groupsDeleted = db.delete(LoyaltyCardDbGroups.TABLE,
-                    LoyaltyCardDbGroups.ID + " = ? ",
-                    new String[]{groupName});
-
-            // And delete lookup table entries associated with this group
-            db.delete(LoyaltyCardDbIdsGroups.TABLE,
-                    LoyaltyCardDbIdsGroups.groupID + " = ? ",
-                    new String[]{groupName});
-
-            if (groupsDeleted == 1) {
-                db.setTransactionSuccessful();
-                success = true;
-            }
-        } finally {
-            db.endTransaction();
-        }
-
-        return success;
-    }
-
-    public int getGroupCardCount(final String groupName)
-    {
-        SQLiteDatabase db = getReadableDatabase();
-
-        Cursor data =  db.rawQuery("SELECT Count(*) FROM " + LoyaltyCardDbIdsGroups.TABLE +
-                " where " + LoyaltyCardDbIdsGroups.groupID + "=?",
-                new String[]{groupName});
-
-        int numItems = 0;
-
-        if(data.getCount() == 1)
-        {
-            data.moveToFirst();
-            numItems = data.getInt(0);
-        }
-
-        data.close();
-
-        return numItems;
-    }
 }
 

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

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

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

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

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

@@ -1,13 +1,7 @@
-package protect.card_locker.importexport;
-
-import org.json.JSONException;
+package protect.card_locker;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
-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
@@ -21,5 +15,5 @@ public interface DatabaseImporter
      * @throws IOException
      * @throws FormatException
      */
-    void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException, JSONException, ParseException;
+    void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException;
 }

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

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

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

@@ -1,56 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
-import android.widget.TextView;
-
-import protect.card_locker.preferences.Settings;
-
-class GroupCursorAdapter extends CursorAdapter
-{
-    Settings settings;
-    DBHelper db;
-
-    public GroupCursorAdapter(Context context, Cursor cursor)
-    {
-        super(context, cursor, 0);
-        settings = new Settings(context);
-
-        db = new DBHelper(context);
-    }
-
-    // The newView method is used to inflate a new view and return it,
-    // you don't bind any data to the view at this point.
-    @Override
-    public View newView(Context context, Cursor cursor, ViewGroup parent)
-    {
-        return LayoutInflater.from(context).inflate(R.layout.group_layout, parent, false);
-    }
-
-    // The bindView method is used to bind all data to a given view
-    // such as setting the text on a TextView.
-    @Override
-    public void bindView(View view, Context context, Cursor cursor)
-    {
-        // Find fields to populate in inflated template
-        TextView nameField = view.findViewById(R.id.name);
-        TextView countField = view.findViewById(R.id.cardCount);
-
-        // Extract properties from cursor
-        Group group = Group.toGroup(cursor);
-
-        Integer groupCardCount = db.getGroupCardCount(group._id);
-
-        // Populate fields with extracted properties
-        nameField.setText(group._id);
-
-        countField.setText(context.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
-
-        nameField.setTextSize(settings.getCardTitleListFontSize());
-        countField.setTextSize(settings.getCardNoteListFontSize());
-    }
-}

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

@@ -2,20 +2,23 @@ package protect.card_locker;
 
 import android.Manifest;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Environment;
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
@@ -25,21 +28,20 @@ import android.widget.Toast;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.io.OutputStream;
+import java.util.List;
 
 public class ImportExportActivity extends AppCompatActivity
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     private static final int PERMISSIONS_EXTERNAL_STORAGE = 1;
-    private static final int CHOOSE_EXPORT_LOCATION = 2;
-    private static final int IMPORT = 3;
+    private static final int CHOOSE_EXPORT_FILE = 2;
 
     private ImportExportTask importExporter;
 
-    private DataFormat importDataFormat;
+    private final File sdcardDir = Environment.getExternalStorageDirectory();
+    private final File exportFile = new File(sdcardDir, "LoyaltyCardKeychain.csv");
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
@@ -68,11 +70,6 @@ public class ImportExportActivity extends AppCompatActivity
                     PERMISSIONS_EXTERNAL_STORAGE);
         }
 
-        // Check that there is a file manager available
-        final Intent intentCreateDocumentAction = new Intent(Intent.ACTION_CREATE_DOCUMENT);
-        intentCreateDocumentAction.addCategory(Intent.CATEGORY_OPENABLE);
-        intentCreateDocumentAction.setType("text/csv");
-        intentCreateDocumentAction.putExtra(Intent.EXTRA_TITLE, "Catima.csv");
 
         Button exportButton = findViewById(R.id.exportButton);
         exportButton.setOnClickListener(new View.OnClickListener()
@@ -80,7 +77,7 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseFileWithIntent(intentCreateDocumentAction, CHOOSE_EXPORT_LOCATION);
+                startExport();
             }
         });
 
@@ -89,16 +86,25 @@ public class ImportExportActivity extends AppCompatActivity
         intentGetContentAction.addCategory(Intent.CATEGORY_OPENABLE);
         intentGetContentAction.setType("*/*");
 
+
         Button importFilesystem = findViewById(R.id.importOptionFilesystemButton);
         importFilesystem.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
             {
-                chooseImportType(intentGetContentAction);
+                chooseFileWithIntent(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);
 
@@ -108,35 +114,42 @@ public class ImportExportActivity extends AppCompatActivity
             @Override
             public void onClick(View v)
             {
-                chooseImportType(intentPickAction);
+                chooseFileWithIntent(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);
+        }
+
+        // This option, to import from the fixed location, should always be present
+
+        Button importButton = findViewById(R.id.importOptionFixedButton);
+        importButton.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Uri uri = Uri.fromFile(exportFile);
+                try
+                {
+                    FileInputStream stream = new FileInputStream(exportFile);
+                    startImport(stream, uri);
+                }
+                catch(FileNotFoundException e)
+                {
+                    Log.e(TAG, "Could not import file " + exportFile.getAbsolutePath(), e);
+                    onImportComplete(false, uri);
+                }
             }
         });
     }
 
-    private void chooseImportType(Intent baseIntent) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.chooseImportType)
-                .setItems(R.array.import_types_array, (dialog, which) -> {
-                    switch (which) {
-                        // Catima
-                        case 0:
-                        // Loyalty Card Keychain
-                        case 1:
-                            importDataFormat = DataFormat.Catima;
-                            break;
-                        // Voucher Vault
-                        case 2:
-                            importDataFormat = DataFormat.VoucherVault;
-                            break;
-                        default:
-                            throw new IllegalArgumentException("Unknown DataFormat");
-                    }
-                    chooseFileWithIntent(baseIntent, IMPORT);
-                });
-        builder.show();
-    }
-
-    private void startImport(final InputStream target, final Uri targetUri, final DataFormat dataFormat)
+    private void startImport(final InputStream target, final Uri targetUri)
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
@@ -148,23 +161,23 @@ public class ImportExportActivity extends AppCompatActivity
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                dataFormat, target, listener);
+                DataFormat.CSV, target, listener);
         importExporter.execute();
     }
 
-    private void startExport(final OutputStream target, final Uri targetUri)
+    private void startExport()
     {
         ImportExportTask.TaskCompleteListener listener = new ImportExportTask.TaskCompleteListener()
         {
             @Override
             public void onTaskComplete(boolean success)
             {
-                onExportComplete(success, targetUri);
+                onExportComplete(success, exportFile);
             }
         };
 
         importExporter = new ImportExportTask(ImportExportActivity.this,
-                DataFormat.Catima, target, listener);
+                DataFormat.CSV, exportFile, listener);
         importExporter.execute();
     }
 
@@ -232,9 +245,13 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.importFailedTitle);
         }
 
-        int messageId = success ? R.string.importSuccessful : R.string.importFailed;
-        final String message = getResources().getString(messageId);
+        int messageId = success ? R.string.importedFrom : R.string.importFailed;
+        final String template = getResources().getString(messageId);
 
+        // Get the filename of the file being imported
+        String filename = path.toString();
+
+        final String message = String.format(template, filename);
         builder.setMessage(message);
         builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
         {
@@ -248,7 +265,7 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    private void onExportComplete(boolean success, final Uri path)
+    private void onExportComplete(boolean success, final File path)
     {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
@@ -261,9 +278,10 @@ public class ImportExportActivity extends AppCompatActivity
             builder.setTitle(R.string.exportFailedTitle);
         }
 
-        int messageId = success ? R.string.exportSuccessful : R.string.exportFailed;
-        final String message = getResources().getString(messageId);
+        int messageId = success ? R.string.exportedTo : R.string.exportFailed;
 
+        final String template = getResources().getString(messageId);
+        final String message = String.format(template, path.getAbsolutePath());
         builder.setMessage(message);
         builder.setNeutralButton(R.string.ok, new DialogInterface.OnClickListener()
         {
@@ -283,8 +301,9 @@ public class ImportExportActivity extends AppCompatActivity
                 @Override
                 public void onClick(DialogInterface dialog, int which)
                 {
+                    Uri outputUri = FileProvider.getUriForFile(ImportExportActivity.this, BuildConfig.APPLICATION_ID, path);
                     Intent sendIntent = new Intent(Intent.ACTION_SEND);
-                    sendIntent.putExtra(Intent.EXTRA_STREAM, path);
+                    sendIntent.putExtra(Intent.EXTRA_STREAM, outputUri);
                     sendIntent.setType("text/csv");
 
                     // set flag to give temporary permission to external app to use the FileProvider
@@ -301,15 +320,39 @@ public class ImportExportActivity extends AppCompatActivity
         builder.create().show();
     }
 
-    private void chooseFileWithIntent(Intent intent, int requestCode)
+    /**
+     * 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)
     {
         try
         {
-            startActivityForResult(intent, requestCode);
+            startActivityForResult(intent, CHOOSE_EXPORT_FILE);
         }
         catch (ActivityNotFoundException e)
         {
-            Toast.makeText(getApplicationContext(), R.string.failedOpeningFileManager, Toast.LENGTH_LONG).show();
             Log.e(TAG, "No activity found to handle intent", e);
         }
     }
@@ -319,7 +362,7 @@ public class ImportExportActivity extends AppCompatActivity
     {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (resultCode != RESULT_OK)
+        if (resultCode != RESULT_OK || requestCode != CHOOSE_EXPORT_FILE)
         {
             Log.w(TAG, "Failed onActivityResult(), result=" + resultCode);
             return;
@@ -334,49 +377,24 @@ public class ImportExportActivity extends AppCompatActivity
 
         try
         {
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
-                OutputStream writer;
-                if (uri.getScheme() != null)
-                {
-                    writer = getContentResolver().openOutputStream(uri);
-                }
-                else
-                {
-                    writer = new FileOutputStream(new File(uri.toString()));
-                }
+            InputStream reader;
 
-                Log.e(TAG, "Starting file export with: " + uri.toString());
-                startExport(writer, uri);
+            if(uri.getScheme() != null)
+            {
+                reader = getContentResolver().openInputStream(uri);
             }
             else
             {
-                InputStream reader;
-                if(uri.getScheme() != null)
-                {
-                    reader = getContentResolver().openInputStream(uri);
-                }
-                else
-                {
-                    reader = new FileInputStream(new File(uri.toString()));
-                }
-
-                Log.e(TAG, "Starting file import with: " + uri.toString());
-
-                startImport(reader, uri, importDataFormat);
+                reader = new FileInputStream(new File(uri.toString()));
             }
+
+            Log.e(TAG, "Starting file import with: " + uri.toString());
+            startImport(reader, uri);
         }
         catch(FileNotFoundException e)
         {
-            Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
-            if (requestCode == CHOOSE_EXPORT_LOCATION)
-            {
-                onExportComplete(false, uri);
-            }
-            else
-            {
-                onImportComplete(false, uri);
-            }
+            Log.e(TAG, "Failed to import file: " + uri.toString(), e);
+            onImportComplete(false, uri);
         }
     }
 }

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

@@ -4,26 +4,27 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
+import android.os.Environment;
 import android.util.Log;
+import android.widget.Toast;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 
-import protect.card_locker.importexport.MultiFormatExporter;
-import protect.card_locker.importexport.MultiFormatImporter;
-
 class ImportExportTask extends AsyncTask<Void, Void, Boolean>
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     private Activity activity;
     private boolean doImport;
     private DataFormat format;
-    private OutputStream outputStream;
+    private File target;
     private InputStream inputStream;
     private TaskCompleteListener listener;
 
@@ -32,14 +33,14 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
     /**
      * Constructor which will setup a task for exporting to the given file
      */
-    ImportExportTask(Activity activity, DataFormat format, OutputStream output,
+    ImportExportTask(Activity activity, DataFormat format, File target,
             TaskCompleteListener listener)
     {
         super();
         this.activity = activity;
         this.doImport = false;
         this.format = format;
-        this.outputStream = output;
+        this.target = target;
         this.listener = listener;
     }
 
@@ -77,13 +78,14 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
         return result;
     }
 
-    private boolean performExport(OutputStream stream, DBHelper db)
+    private boolean performExport(File exportFile, DBHelper db)
     {
         boolean result = false;
 
         try
         {
-            OutputStreamWriter writer = new OutputStreamWriter(stream, Charset.forName("UTF-8"));
+            FileOutputStream fileWriter = new FileOutputStream(exportFile);
+            OutputStreamWriter writer = new OutputStreamWriter(fileWriter, Charset.forName("UTF-8"));
             result = MultiFormatExporter.exportData(db, writer, format);
             writer.close();
         }
@@ -92,7 +94,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
             Log.e(TAG, "Unable to export file", e);
         }
 
-        Log.i(TAG, "Export result: " + result);
+        Log.i(TAG, "Export of '" + exportFile.getAbsolutePath() + "' result: " + result);
 
         return result;
     }
@@ -125,7 +127,7 @@ class ImportExportTask extends AsyncTask<Void, Void, Boolean>
         }
         else
         {
-            result = performExport(outputStream, db);
+            result = performExport(target, db);
         }
 
         return result;

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

@@ -4,39 +4,29 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import java.io.InvalidObjectException;
-import java.math.BigDecimal;
-import java.util.Currency;
-import java.util.Date;
 
 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_TYPE = DBHelper.LoyaltyCardDbIds.BARCODE_TYPE;
-
     private static final String HEADER_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_COLOR;
+    private static final String HEADER_TEXT_COLOR = DBHelper.LoyaltyCardDbIds.HEADER_TEXT_COLOR;
 
     private final Context context;
     private final String host;
     private final String path;
-    private final String oldHost;
-    private final String oldPath;
     private final String shareText;
 
     public ImportURIHelper(Context context) {
         this.context = context;
         host = context.getResources().getString(R.string.intent_import_card_from_url_host);
         path = context.getResources().getString(R.string.intent_import_card_from_url_path_prefix);
-        oldHost = "brarcher.github.io";
-        oldPath = "/loyalty-card-locker/share";
         shareText = context.getResources().getString(R.string.intent_import_card_from_url_share_text);
     }
 
     private boolean isImportUri(Uri uri) {
-        return (uri.getHost().equals(host) && uri.getPath().equals(path)) || (uri.getHost().equals(oldHost) && uri.getPath().equals(oldPath));
+        return uri.getHost().equals(host) && uri.getPath().equals(path);
     }
 
     public LoyaltyCard parse(Uri uri) throws InvalidObjectException {
@@ -46,9 +36,6 @@ public class ImportURIHelper {
 
         try {
             // These values are allowed to be null
-            Date expiry = null;
-            BigDecimal balance = new BigDecimal("0");
-            Currency balanceType = null;
             Integer headerColor = null;
             Integer headerTextColor = null;
 
@@ -56,31 +43,17 @@ public class ImportURIHelper {
             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");
-
-            String unparsedBalance = uri.getQueryParameter(BALANCE);
-            if(unparsedBalance != null && !unparsedBalance.equals(""))
-            {
-                balance = new BigDecimal(unparsedBalance);
-            }
-            String unparsedBalanceType = uri.getQueryParameter(BALANCE_TYPE);
-            if (unparsedBalanceType != null && !unparsedBalanceType.equals(""))
-            {
-                balanceType = Currency.getInstance(unparsedBalanceType);
-            }
-            String unparsedExpiry = uri.getQueryParameter(EXPIRY);
-            if(unparsedExpiry != null && !unparsedExpiry.equals(""))
-            {
-                expiry = new Date(Long.parseLong(unparsedExpiry));
-            }
-
             String unparsedHeaderColor = uri.getQueryParameter(HEADER_COLOR);
             if(unparsedHeaderColor != null)
             {
                 headerColor = Integer.parseInt(unparsedHeaderColor);
             }
-
-            return new LoyaltyCard(-1, store, note, expiry, balance, balanceType, cardId, barcodeType, headerColor, headerTextColor, 0);
+            String unparsedHeaderTextColor = uri.getQueryParameter(HEADER_TEXT_COLOR);
+            if(unparsedHeaderTextColor != null)
+            {
+                headerTextColor = Integer.parseInt(unparsedHeaderTextColor);
+            }
+            return new LoyaltyCard(-1, store, note, cardId, barcodeType, headerColor, headerTextColor);
         } catch (NullPointerException | NumberFormatException ex) {
             throw new InvalidObjectException("Not a valid import URI");
         }
@@ -94,20 +67,17 @@ public class ImportURIHelper {
         uriBuilder.path(path);
         uriBuilder.appendQueryParameter(STORE, loyaltyCard.store);
         uriBuilder.appendQueryParameter(NOTE, loyaltyCard.note);
-        uriBuilder.appendQueryParameter(BALANCE, loyaltyCard.balance.toString());
-        if (loyaltyCard.balanceType != null) {
-            uriBuilder.appendQueryParameter(BALANCE_TYPE, loyaltyCard.balanceType.getCurrencyCode());
-        }
-        if (loyaltyCard.expiry != null) {
-            uriBuilder.appendQueryParameter(EXPIRY, String.valueOf(loyaltyCard.expiry.getTime()));
-        }
         uriBuilder.appendQueryParameter(CARD_ID, loyaltyCard.cardId);
         uriBuilder.appendQueryParameter(BARCODE_TYPE, loyaltyCard.barcodeType);
         if(loyaltyCard.headerColor != null)
         {
             uriBuilder.appendQueryParameter(HEADER_COLOR, loyaltyCard.headerColor.toString());
         }
-        //StarStatus will not be exported
+        if(loyaltyCard.headerTextColor != null)
+        {
+            uriBuilder.appendQueryParameter(HEADER_TEXT_COLOR, loyaltyCard.headerTextColor.toString());
+        }
+
         return uriBuilder.build();
     }
 

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

@@ -1,11 +1,6 @@
 package protect.card_locker;
 
 import android.database.Cursor;
-
-import java.math.BigDecimal;
-import java.util.Currency;
-import java.util.Date;
-
 import androidx.annotation.Nullable;
 
 public class LoyaltyCard
@@ -13,9 +8,6 @@ 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;
 
@@ -25,24 +17,16 @@ public class LoyaltyCard
     @Nullable
     public final Integer headerTextColor;
 
-    public final int starStatus;
-
-    public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
-                       final BigDecimal balance, final Currency balanceType, final String cardId,
-                       final String barcodeType, final Integer headerColor, final Integer headerTextColor,
-                       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)
     {
         this.id = id;
         this.store = store;
         this.note = note;
-        this.expiry = expiry;
-        this.balance = balance;
-        this.balanceType = balanceType;
         this.cardId = cardId;
         this.barcodeType = barcodeType;
         this.headerColor = headerColor;
         this.headerTextColor = headerTextColor;
-        this.starStatus = starStatus;
     }
 
     public static LoyaltyCard toLoyaltyCard(Cursor cursor)
@@ -50,31 +34,15 @@ 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));
-        int starred = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STAR_STATUS));
 
-        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);
 
-        Currency balanceType = null;
-        Date expiry = null;
         Integer headerColor = null;
         Integer headerTextColor = null;
 
-        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);
@@ -85,6 +53,6 @@ public class LoyaltyCard
             headerTextColor = cursor.getInt(headerTextColorColumn);
         }
 
-        return new LoyaltyCard(id, store, note, expiry, balance, balanceType, cardId, barcodeType, headerColor, headerTextColor, starred);
+        return new LoyaltyCard(id, store, note, cardId, barcodeType, headerColor, headerTextColor);
     }
 }

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

@@ -9,20 +9,18 @@ import android.widget.CursorAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.util.Date;
-
 import protect.card_locker.preferences.Settings;
 
 class LoyaltyCardCursorAdapter extends CursorAdapter
 {
     Settings settings;
+    DBHelper dbHelper;
 
     public LoyaltyCardCursorAdapter(Context context, Cursor cursor)
     {
         super(context, cursor, 0);
         settings = new Settings(context);
+        dbHelper = new DBHelper(context);
     }
 
     // The newView method is used to inflate a new view and return it,
@@ -40,24 +38,31 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
     {
         // 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);
-        TextView balanceField = view.findViewById(R.id.balance);
-        TextView expiryField = view.findViewById(R.id.expiry);
-        ImageView star = view.findViewById(R.id.star);
+        TextView storeField = (TextView) view.findViewById(R.id.store);
+        TextView noteField = (TextView) view.findViewById(R.id.note);
 
         // Extract properties from cursor
         LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
 
+        // Get amount of cards for this store
+        int cardCount = dbHelper.getLoyaltyCardsForStore(loyaltyCard.store).size();
+
         // Populate fields with extracted properties
         storeField.setText(loyaltyCard.store);
 
         storeField.setTextSize(settings.getCardTitleListFontSize());
 
-        if(!loyaltyCard.note.isEmpty())
+        if(cardCount > 1 || !loyaltyCard.note.isEmpty())
         {
             noteField.setVisibility(View.VISIBLE);
-            noteField.setText(loyaltyCard.note);
+            if(cardCount > 1)
+            {
+                noteField.setText(context.getResources().getString(R.string.cardCount, cardCount));
+            }
+            else
+            {
+                noteField.setText(loyaltyCard.note);
+            }
             noteField.setTextSize(settings.getCardNoteListFontSize());
         }
         else
@@ -65,34 +70,13 @@ class LoyaltyCardCursorAdapter extends CursorAdapter
             noteField.setVisibility(View.GONE);
         }
 
-        if(!loyaltyCard.balance.equals(new BigDecimal("0"))) {
-            balanceField.setVisibility(View.VISIBLE);
-            balanceField.setText(context.getString(R.string.balanceSentence, Utils.formatBalance(context, loyaltyCard.balance, loyaltyCard.balanceType)));
-        }
-        else
-        {
-            balanceField.setVisibility(View.GONE);
-        }
+        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
+        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
 
-        if(loyaltyCard.expiry != null)
-        {
-            expiryField.setVisibility(View.VISIBLE);
-            int expiryString = R.string.expiryStateSentence;
-            if(Utils.hasExpired(loyaltyCard.expiry)) {
-                expiryString = R.string.expiryStateSentenceExpired;
-                expiryField.setTextColor(context.getResources().getColor(R.color.alert));
-            }
-            expiryField.setText(context.getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
-            expiryField.setTextSize(settings.getCardNoteListFontSize());
-        }
-        else
-        {
-            expiryField.setVisibility(View.GONE);
-        }
-
-        if (loyaltyCard.starStatus!=0) star.setVisibility(View.VISIBLE);
-            else star.setVisibility(View.GONE);
-
-        thumbnail.setImageBitmap(Utils.generateIcon(context, loyaltyCard.store, loyaltyCard.headerColor).getLetterTile());
+        Integer letterBackgroundColor = loyaltyCard.headerColor;
+        Integer letterTextColor = loyaltyCard.headerTextColor;
+        LetterBitmap letterBitmap = new LetterBitmap(context, loyaltyCard.store, loyaltyCard.store,
+                tileLetterFontSize, pixelSize, pixelSize, letterBackgroundColor, letterTextColor);
+        thumbnail.setImageBitmap(letterBitmap.getLetterTile());
     }
 }

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

@@ -1,8 +1,6 @@
 package protect.card_locker;
 
-import android.annotation.SuppressLint;
-import android.app.DatePickerDialog;
-import android.app.Dialog;
+import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -11,101 +9,72 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 
-import com.google.android.material.chip.Chip;
-import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.DialogFragment;
-
-import android.os.LocaleList;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewTreeObserver;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
 import android.widget.Button;
-import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.android.material.tabs.TabLayout;
 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
 import com.jaredrummler.android.colorpicker.ColorPickerDialog;
 import com.jaredrummler.android.colorpicker.ColorPickerDialogListener;
 
 import java.io.InvalidObjectException;
-import java.math.BigDecimal;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Currency;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
 
 public class LoyaltyCardEditActivity extends AppCompatActivity
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "CardLocker";
+    protected static final String NO_BARCODE = "_NO_BARCODE_";
 
-    TabLayout tabs;
+    protected static final int SELECT_BARCODE_REQUEST = 1;
 
-    ImageView thumbnail;
+    FloatingActionButton fabSave;
     EditText storeFieldEdit;
     EditText noteFieldEdit;
-    ChipGroup groupsChips;
-    AutoCompleteTextView expiryField;
-    EditText balanceField;
-    AutoCompleteTextView balanceCurrencyField;
+    ImageView headingColorSample;
+    Button headingColorSelectButton;
+    ImageView headingStoreTextColorSample;
+    Button headingStoreTextColorSelectButton;
     TextView cardIdFieldView;
-    AutoCompleteTextView barcodeTypeField;
+    View cardIdDivider;
+    View cardIdTableRow;
+    TextView barcodeTypeField;
     ImageView barcodeImage;
     View barcodeImageLayout;
     View barcodeCaptureLayout;
 
+    Button captureButton;
     Button enterButton;
 
     int loyaltyCardId;
     boolean updateLoyaltyCard;
-    String barcodeType;
-    String cardId;
-
+    String loyaltyCardStorePrefill = "";
     Uri importLoyaltyCardUri = null;
     Integer headingColorValue = null;
+    Integer headingStoreTextColorValue = null;
 
     DBHelper db;
     ImportURIHelper importUriHelper;
 
-    boolean hasChanged = false;
-    boolean initDone = false;
-    AlertDialog confirmExitDialog = null;
-
-    boolean validBalance = true;
-
-    HashMap<String, Currency> currencies = new HashMap<>();
-
     private void extractIntentFields(Intent intent)
     {
         final Bundle b = intent.getExtras();
         loyaltyCardId = b != null ? b.getInt("id") : 0;
         updateLoyaltyCard = b != null && b.getBoolean("update", false);
-
-        barcodeType = b != null ? b.getString("barcodeType") : null;
-        cardId = b != null ? b.getString("cardId") : null;
-
+        loyaltyCardStorePrefill = b != null ? b.getString("store", "") : "";
         importLoyaltyCardUri = intent.getData();
 
         Log.d(TAG, "View activity: id=" + loyaltyCardId
@@ -131,230 +100,23 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         db = new DBHelper(this);
         importUriHelper = new ImportURIHelper(this);
 
-        for (Currency currency : Currency.getAvailableCurrencies()) {
-            currencies.put(currency.getSymbol(), currency);
-        }
-
-        tabs = findViewById(R.id.tabs);
-        thumbnail = findViewById(R.id.thumbnail);
+        fabSave = findViewById(R.id.fabSave);
         storeFieldEdit = findViewById(R.id.storeNameEdit);
         noteFieldEdit = findViewById(R.id.noteEdit);
-        groupsChips = findViewById(R.id.groupChips);
-        expiryField = findViewById(R.id.expiryField);
-        balanceField = findViewById(R.id.balanceField);
-        balanceCurrencyField = findViewById(R.id.balanceCurrencyField);
+        headingColorSample = findViewById(R.id.headingColorSample);
+        headingColorSelectButton = findViewById(R.id.headingColorSelectButton);
+        headingStoreTextColorSample = findViewById(R.id.headingStoreTextColorSample);
+        headingStoreTextColorSelectButton = findViewById(R.id.headingStoreTextColorSelectButton);
         cardIdFieldView = findViewById(R.id.cardIdView);
-        barcodeTypeField = findViewById(R.id.barcodeTypeField);
+        cardIdDivider = findViewById(R.id.cardIdDivider);
+        cardIdTableRow = findViewById(R.id.cardIdTableRow);
+        barcodeTypeField = findViewById(R.id.barcodeType);
         barcodeImage = findViewById(R.id.barcode);
         barcodeImageLayout = findViewById(R.id.barcodeLayout);
         barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
 
+        captureButton = findViewById(R.id.captureButton);
         enterButton = findViewById(R.id.enterButton);
-
-        storeFieldEdit.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                hasChanged = true;
-
-                generateIcon(s.toString());
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) { }
-        });
-
-        expiryField.addTextChangedListener(new TextWatcher() {
-            CharSequence lastValue;
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                lastValue = s;
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                hasChanged = true;
-
-                if (s.toString().equals(getString(R.string.never))) {
-                    expiryField.setTag(null);
-                } else if (s.toString().equals(getString(R.string.chooseExpiryDate))) {
-                    if (!lastValue.toString().equals(getString(R.string.chooseExpiryDate))) {
-                        expiryField.setText(lastValue);
-                    };
-                    DialogFragment datePickerFragment = new DatePickerFragment(expiryField);
-                    datePickerFragment.show(getSupportFragmentManager(), "datePicker");
-                }
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                ArrayList<String> expiryList = new ArrayList<>();
-                expiryList.add(0, getString(R.string.never));
-                expiryList.add(1, getString(R.string.chooseExpiryDate));
-                ArrayAdapter<String> expiryAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, expiryList);
-                expiryField.setAdapter(expiryAdapter);
-            }
-        });
-
-        balanceField.setOnFocusChangeListener((v, hasFocus) -> {
-            if (!hasFocus) {
-                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol((BigDecimal) balanceField.getTag(), (Currency) balanceCurrencyField.getTag()));
-            }
-        });
-
-        balanceField.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                hasChanged = true;
-
-                try {
-                    BigDecimal balance = Utils.parseCurrency(s.toString(), Utils.currencyHasDecimals((Currency) balanceCurrencyField.getTag()));
-                    validBalance = true;
-
-                    balanceField.setTag(balance);
-                } catch (NumberFormatException e) {
-                    validBalance = false;
-                    e.printStackTrace();
-                }
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) { }
-        });
-
-        balanceCurrencyField.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                hasChanged = true;
-
-                Currency currency;
-
-                if (s.toString().equals(getString(R.string.points))) {
-                    currency = null;
-                } else {
-                    currency = currencies.get(s.toString());
-                }
-
-                balanceCurrencyField.setTag(currency);
-
-                BigDecimal balance = (BigDecimal) balanceField.getTag();
-
-                if (balance != null) {
-                    balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(balance, currency));
-                }
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                ArrayList<String> currencyList = new ArrayList<>(currencies.keySet());
-                Collections.sort(currencyList, (o1, o2) -> {
-                    boolean o1ascii = o1.matches("^[^a-zA-Z]*$");
-                    boolean o2ascii = o2.matches("^[^a-zA-Z]*$");
-
-                    if (!o1ascii && o2ascii) {
-                        return 1;
-                    } else if (o1ascii && !o2ascii) {
-                        return -1;
-                    }
-
-                    return o1.compareTo(o2);
-                });
-
-                // Sort locale currencies on top
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    LocaleList locales = getApplicationContext().getResources().getConfiguration().getLocales();
-
-                    for (int i = locales.size() - 1; i > 0; i--) {
-                        Locale locale = locales.get(i);
-                        String currencySymbol = Currency.getInstance(locale).getSymbol();
-                        currencyList.remove(currencySymbol);
-                        currencyList.add(0, currencySymbol);
-                    }
-                } else {
-                    String currencySymbol = Currency.getInstance(getApplicationContext().getResources().getConfiguration().locale).getSymbol();
-                    currencyList.remove(currencySymbol);
-                    currencyList.add(0, currencySymbol);
-                }
-
-                currencyList.add(0, getString(R.string.points));
-                ArrayAdapter<String> currencyAdapter = new ArrayAdapter<>(LoyaltyCardEditActivity.this, android.R.layout.select_dialog_item, currencyList);
-                balanceCurrencyField.setAdapter(currencyAdapter);
-            }
-        });
-
-        cardIdFieldView.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                hasChanged = true;
-
-                String formatString = barcodeTypeField.getText().toString();
-
-                if (!formatString.isEmpty()) {
-                    if (formatString.equals(getString(R.string.noBarcode))) {
-                        hideBarcode();
-                    } else {
-                        generateBarcode(s.toString(), BarcodeFormat.valueOf(formatString));
-                    }
-                }
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) { }
-        });
-
-        barcodeTypeField.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) { }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                hasChanged = true;
-
-                if (!s.toString().isEmpty()) {
-                    if (s.toString().equals(getString(R.string.noBarcode))) {
-                        hideBarcode();
-                    } else {
-                        generateBarcode(cardIdFieldView.getText().toString(), BarcodeFormat.valueOf(s.toString()));
-                    }
-                }
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) { }
-        });
-
-        tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
-            public void onTabSelected(TabLayout.Tab tab) {
-                showPart(tab.getText().toString());
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            @edu.umd.cs.findbugs.annotations.SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
-            public void onTabReselected(TabLayout.Tab tab) {
-                showPart(tab.getText().toString());
-            }
-        });
-
-        tabs.selectTab(tabs.getTabAt(0));
     }
 
     @Override
@@ -368,17 +130,10 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         // Reset these fields, so they are re-populated in onResume().
         storeFieldEdit.setText("");
         noteFieldEdit.setText("");
-        expiryField.setTag(null);
-        expiryField.setText("");
-        balanceCurrencyField.setTag(null);
-        balanceCurrencyField.setText("");
-        balanceField.setTag(null);
-        balanceField.setText("");
         cardIdFieldView.setText("");
         barcodeTypeField.setText("");
     }
 
-    @SuppressLint("DefaultLocale")
     @Override
     public void onResume()
     {
@@ -386,6 +141,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
         Log.i(TAG, "To view card: " + loyaltyCardId);
 
+        fabSave.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View view) {
+                doSave();
+            }
+        });
+
         if(updateLoyaltyCard)
         {
             final LoyaltyCard loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
@@ -407,24 +170,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 noteFieldEdit.setText(loyaltyCard.note);
             }
 
-            if(expiryField.getText().length() == 0)
-            {
-                expiryField.setTag(loyaltyCard.expiry);
-                formatExpiryField(loyaltyCard.expiry);
-            }
-
-            if(balanceCurrencyField.getText().length() == 0)
-            {
-                balanceCurrencyField.setTag(loyaltyCard.balanceType);
-                formatBalanceCurrencyField(loyaltyCard.balanceType);
-            }
-
-            if(balanceField.getText().length() == 0)
-            {
-                balanceField.setTag(loyaltyCard.balance);
-                balanceField.setText(Utils.formatBalanceWithoutCurrencySymbol(loyaltyCard.balance, loyaltyCard.balanceType));
-            }
-
             if(cardIdFieldView.getText().length() == 0)
             {
                 cardIdFieldView.setText(loyaltyCard.cardId);
@@ -432,7 +177,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             if(barcodeTypeField.getText().length() == 0)
             {
-                barcodeTypeField.setText(loyaltyCard.barcodeType.isEmpty() ? getString(R.string.noBarcode) : loyaltyCard.barcodeType);
+                barcodeTypeField.setText(loyaltyCard.barcodeType);
             }
 
             if(headingColorValue == null)
@@ -444,6 +189,15 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 }
             }
 
+            if(headingStoreTextColorValue == null)
+            {
+                headingStoreTextColorValue = loyaltyCard.headerTextColor;
+                if(headingStoreTextColorValue == null)
+                {
+                    headingStoreTextColorValue = Color.WHITE;
+                }
+            }
+
             setTitle(R.string.editCardTitle);
         }
         else if(importLoyaltyCardUri != null)
@@ -460,58 +214,20 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
 
             storeFieldEdit.setText(importCard.store);
             noteFieldEdit.setText(importCard.note);
-            expiryField.setTag(importCard.expiry);
-            formatExpiryField(importCard.expiry);
-            balanceField.setTag(importCard.balance);
-            balanceCurrencyField.setTag(importCard.balanceType);
-            formatBalanceCurrencyField(importCard.balanceType);
             cardIdFieldView.setText(importCard.cardId);
             barcodeTypeField.setText(importCard.barcodeType);
             headingColorValue = importCard.headerColor;
+            headingStoreTextColorValue = importCard.headerTextColor;
         }
         else
         {
             setTitle(R.string.addCardTitle);
-            expiryField.setTag(null);
-            expiryField.setText(getString(R.string.never));
-            balanceField.setTag(new BigDecimal("0"));
-            balanceCurrencyField.setTag(null);
-            formatBalanceCurrencyField(null);
-            hideBarcode();
         }
 
-        if(groupsChips.getChildCount() == 0)
+        // Set prefill values if nothing is set
+        if(storeFieldEdit.getText().length() == 0 && !loyaltyCardStorePrefill.isEmpty())
         {
-            List<Group> existingGroups = db.getGroups();
-
-            List<Group> loyaltyCardGroups = db.getLoyaltyCardGroups(loyaltyCardId);
-
-            if (existingGroups.isEmpty()) {
-                groupsChips.setVisibility(View.GONE);
-            } else {
-                groupsChips.setVisibility(View.VISIBLE);
-            }
-
-            for (Group group : db.getGroups()) {
-                Chip chip = (Chip) getLayoutInflater().inflate(R.layout.layout_chip_choice, groupsChips, false);
-                chip.setText(group._id);
-                chip.setTag(group);
-
-                chip.setChecked(false);
-                for (Group loyaltyCardGroup : loyaltyCardGroups) {
-                    if (loyaltyCardGroup._id.equals(group._id)) {
-                        chip.setChecked(true);
-                        break;
-                    }
-                }
-                chip.setOnTouchListener((v, event) -> {
-                    hasChanged = true;
-
-                    return false;
-                });
-
-                groupsChips.addView(chip);
-            }
+            storeFieldEdit.setText(loyaltyCardStorePrefill);
         }
 
         if(headingColorValue == null)
@@ -523,124 +239,121 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             colors.recycle();
         }
 
-        thumbnail.setOnClickListener(new ColorSelectListener(headingColorValue));
-
-        if (!initDone) {
-            hasChanged = false;
-            initDone = true;
+        if(headingStoreTextColorValue == null) {
+            headingStoreTextColorValue = Color.WHITE;
         }
 
-        // Update from intent
-        if (barcodeType != null) {
-            barcodeTypeField.setText(barcodeType.isEmpty() ? getString(R.string.noBarcode) : barcodeType);
-            barcodeType = null;
-        }
-        if (cardId != null) {
-            cardIdFieldView.setText(cardId);
-            cardId = null;
-        }
+        headingColorSample.setBackgroundColor(headingColorValue);
+        headingStoreTextColorSample.setBackgroundColor(headingStoreTextColorValue);
+        headingColorSelectButton.setOnClickListener(new ColorSelectListener(headingColorValue, true));
+        headingStoreTextColorSelectButton.setOnClickListener(new ColorSelectListener(headingStoreTextColorValue, false));
 
         if(cardIdFieldView.getText().length() > 0 && barcodeTypeField.getText().length() > 0)
         {
-            String formatString = barcodeTypeField.getText().toString();
-
-            if(formatString.isEmpty() || formatString.equals(getString(R.string.noBarcode)))
+            if(barcodeTypeField.getText().equals(NO_BARCODE))
             {
-                hideBarcode();
+                barcodeImageLayout.setVisibility(View.GONE);
             }
             else
             {
+                String formatString = barcodeTypeField.getText().toString();
                 final BarcodeFormat format = BarcodeFormat.valueOf(formatString);
                 final String cardIdString = cardIdFieldView.getText().toString();
 
-                generateBarcode(cardIdString, format);
+                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()
+                                {
+                                    if (Build.VERSION.SDK_INT < 16)
+                                    {
+                                        barcodeImage.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                                    }
+                                    else
+                                    {
+                                        barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                                    }
+
+                                    Log.d(TAG, "ImageView size now known");
+                                    new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
+                                }
+                            });
+                }
+                else
+                {
+                    Log.d(TAG, "ImageView size known known, creating barcode");
+                    new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
+                }
+
+                barcodeImageLayout.setVisibility(View.VISIBLE);
             }
         }
 
-        enterButton.setOnClickListener(new EditCardIdAndBarcode());
-        barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
-
-        ArrayList<String> barcodeList = new ArrayList<>(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
-        barcodeList.add(0, getString(R.string.noBarcode));
-        ArrayAdapter<String> barcodeAdapter = new ArrayAdapter<>(this, android.R.layout.select_dialog_item, barcodeList);
-        barcodeTypeField.setAdapter(barcodeAdapter);
-
-        FloatingActionButton saveButton = findViewById(R.id.fabSave);
-        saveButton.setOnClickListener(v -> doSave());
-
-        generateIcon(storeFieldEdit.getText().toString());
-    }
-
-    private void formatExpiryField(Date expiry) {
-        if (expiry == null) {
-            expiryField.setText(getString(R.string.never));
-        } else {
-            expiryField.setText(DateFormat.getDateInstance(DateFormat.LONG).format(expiry));
-        }
-    }
-
-    private void formatBalanceCurrencyField(Currency balanceType) {
-        if (balanceType == null) {
-            balanceCurrencyField.setText(getString(R.string.points));
-        } else {
-            balanceCurrencyField.setText(balanceType.getSymbol());
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        askBeforeQuitIfChanged();
-    }
-
-    private void askBeforeQuitIfChanged() {
-        if (!hasChanged) {
-            finish();
-            return;
-        }
-
-        if (confirmExitDialog == null) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle(R.string.leaveWithoutSaveTitle);
-            builder.setMessage(R.string.leaveWithoutSaveConfirmation);
-            builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    finish();
-                    dialog.dismiss();
-                }
-            });
-            builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    dialog.dismiss();
-                }
-            });
-            confirmExitDialog = builder.create();
-        }
-        confirmExitDialog.show();
-    }
-
-    class EditCardIdAndBarcode implements View.OnClickListener
-    {
-        @Override
-        public void onClick(View v)
+        View.OnClickListener captureCallback = new View.OnClickListener()
         {
+            @Override
+            public void onClick(View v)
+            {
+                IntentIntegrator integrator = new IntentIntegrator(LoyaltyCardEditActivity.this);
+                integrator.setDesiredBarcodeFormats(BarcodeSelectorActivity.SUPPORTED_BARCODE_TYPES);
 
-            Intent i = new Intent(getApplicationContext(), ScanActivity.class);
-            final Bundle b = new Bundle();
-            b.putString("cardId", cardIdFieldView.getText().toString());
-            i.putExtras(b);
-            startActivityForResult(i, Utils.BARCODE_SCAN);
+                String prompt = getResources().getString(R.string.scanCardBarcode);
+                integrator.setPrompt(prompt);
+                integrator.setBeepEnabled(false);
+                integrator.initiateScan();
+            }
+        };
+
+        captureButton.setOnClickListener(captureCallback);
+
+        enterButton.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+
+                String cardId = cardIdFieldView.getText().toString();
+                if(cardId.length() > 0)
+                {
+                    final Bundle b = new Bundle();
+                    b.putString("initialCardId", cardId);
+                    i.putExtras(b);
+                }
+
+                startActivityForResult(i, SELECT_BARCODE_REQUEST);
+            }
+        });
+
+        if(cardIdFieldView.getText().length() > 0)
+        {
+            cardIdDivider.setVisibility(View.VISIBLE);
+            cardIdTableRow.setVisibility(View.VISIBLE);
+            enterButton.setText(R.string.editCard);
+        }
+        else
+        {
+            cardIdDivider.setVisibility(View.GONE);
+            cardIdTableRow.setVisibility(View.GONE);
+            enterButton.setText(R.string.enterCard);
         }
     }
 
     class ColorSelectListener implements View.OnClickListener
     {
         final int defaultColor;
+        final boolean isBackgroundColor;
 
-        ColorSelectListener(int defaultColor)
+        ColorSelectListener(int defaultColor, boolean isBackgroundColor)
         {
             this.defaultColor = defaultColor;
+            this.isBackgroundColor = isBackgroundColor;
         }
 
         @Override
@@ -652,11 +365,16 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 @Override
                 public void onColorSelected(int dialogId, int color)
                 {
-                    hasChanged = true;
-
-                    headingColorValue = color;
-
-                    generateIcon(storeFieldEdit.getText().toString());
+                    if(isBackgroundColor)
+                    {
+                        headingColorSample.setBackgroundColor(color);
+                        headingColorValue = color;
+                    }
+                    else
+                    {
+                        headingStoreTextColorSample.setBackgroundColor(color);
+                        headingStoreTextColorValue = color;
+                    }
                 }
 
                 @Override
@@ -665,53 +383,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                     // Nothing to do, no change made
                 }
             });
-            dialog.show(getSupportFragmentManager(), "color-picker-dialog");
-        }
-    }
-
-    public static class DatePickerFragment extends DialogFragment
-            implements DatePickerDialog.OnDateSetListener {
-
-        final EditText expiryFieldEdit;
-
-        DatePickerFragment(EditText expiryFieldEdit) {
-            this.expiryFieldEdit = expiryFieldEdit;
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            // Use the current date as the default date in the picker
-            final Calendar c = Calendar.getInstance();
-
-            Date date = (Date) expiryFieldEdit.getTag();
-            if (date != null) {
-                c.setTime(date);
-            }
-
-            int year = c.get(Calendar.YEAR);
-            int month = c.get(Calendar.MONTH);
-            int day = c.get(Calendar.DAY_OF_MONTH);
-
-            // Create a new instance of DatePickerDialog and return it
-            return new DatePickerDialog(getActivity(), this, year, month, day);
-        }
-
-        public void onDateSet(DatePicker view, int year, int month, int day) {
-            Calendar c = Calendar.getInstance();
-            c.set(Calendar.YEAR, year);
-            c.set(Calendar.MONTH, month);
-            c.set(Calendar.DAY_OF_MONTH, day);
-            c.set(Calendar.HOUR, 0);
-            c.set(Calendar.MINUTE, 0);
-            c.set(Calendar.SECOND, 0);
-            c.set(Calendar.MILLISECOND, 0);
-
-            long unixTime = c.getTimeInMillis();
-
-            Date date = new Date(unixTime);
-
-            expiryFieldEdit.setTag(date);
-            expiryFieldEdit.setText(DateFormat.getDateInstance(DateFormat.LONG).format(date));
+            dialog.show(getFragmentManager(), "color-picker-dialog");
         }
     }
 
@@ -719,15 +391,12 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     {
         String store = storeFieldEdit.getText().toString();
         String note = noteFieldEdit.getText().toString();
-        Date expiry = (Date) expiryField.getTag();
-        BigDecimal balance = (BigDecimal) balanceField.getTag();
-        Currency balanceType = balanceCurrencyField.getTag() != null ? ((Currency) balanceCurrencyField.getTag()) : null;
         String cardId = cardIdFieldView.getText().toString();
         String barcodeType = barcodeTypeField.getText().toString();
 
         // We do not want to save the no barcode string to the database
         // it is simply an empty there for no barcode
-        if(barcodeType.equals(getString(R.string.noBarcode)))
+        if(barcodeType.equals(NO_BARCODE))
         {
             barcodeType = "";
         }
@@ -744,31 +413,16 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
             return;
         }
 
-        if(!validBalance)
-        {
-            Snackbar.make(balanceField, getString(R.string.parsingBalanceFailed, balanceField.getText().toString()), Snackbar.LENGTH_LONG).show();
-            return;
-        }
-
-        List<Group> selectedGroups = new ArrayList<>();
-
-        for (Integer chipId : groupsChips.getCheckedChipIds()) {
-            Chip chip = groupsChips.findViewById(chipId);
-            selectedGroups.add((Group) chip.getTag());
-        }
-
         if(updateLoyaltyCard)
-        {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
-            db.updateLoyaltyCard(loyaltyCardId, store, note, expiry, balance, balanceType, cardId, barcodeType, headingColorValue);
+        {
+            db.updateLoyaltyCard(loyaltyCardId, store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
             Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
         }
         else
         {
-            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, expiry, balance, balanceType, cardId, barcodeType, headingColorValue, 0);
+            loyaltyCardId = (int)db.insertLoyaltyCard(store, note, cardId, barcodeType, headingColorValue, headingStoreTextColorValue);
         }
 
-        db.setLoyaltyCardGroups(loyaltyCardId, selectedGroups);
-
         finish();
     }
 
@@ -779,10 +433,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         {
             getMenuInflater().inflate(R.menu.card_update_menu, menu);
         }
-        else
-        {
-            getMenuInflater().inflate(R.menu.card_add_menu, menu);
-        }
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -795,7 +445,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
         switch(id)
         {
             case android.R.id.home:
-                askBeforeQuitIfChanged();
+                finish();
                 break;
 
             case R.id.action_delete:
@@ -840,86 +490,39 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
     {
         super.onActivityResult(requestCode, resultCode, intent);
 
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
+        String contents = null;
+        String format = null;
 
-        barcodeType = barcodeValues.format();
-        cardId = barcodeValues.content();
-
-        onResume();
-    }
-
-    private void showBarcode() {
-        barcodeImageLayout.setVisibility(View.VISIBLE);
-    }
-
-    private void hideBarcode() {
-        barcodeImageLayout.setVisibility(View.GONE);
-    }
-
-    private void generateBarcode(final String cardId, final BarcodeFormat barcodeFormat) {
-        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, cardId, barcodeFormat).execute();
-                        }
-                    });
-        } else {
-            Log.d(TAG, "ImageView size known known, creating barcode");
-            new BarcodeImageWriterTask(barcodeImage, cardId, barcodeFormat).execute();
+        IntentResult result =
+                IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+        if (result != null)
+        {
+            Log.i(TAG, "Received barcode information from capture");
+            contents = result.getContents();
+            format = result.getFormatName();
         }
 
-        showBarcode();
-    }
+        if(requestCode == SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK)
+        {
+            Log.i(TAG, "Received barcode information from typing it");
 
-    private void generateIcon(String store) {
-        if (headingColorValue == null) {
-            return;
+            contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
+            format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
         }
 
-        thumbnail.setBackgroundColor(headingColorValue);
+        if(contents != null && contents.isEmpty() == false &&
+                format != null)
+        {
+            Log.i(TAG, "Read barcode id: " + contents);
+            Log.i(TAG, "Read format: " + format);
 
-        LetterBitmap letterBitmap = Utils.generateIcon(this, store, headingColorValue);
+            TextView cardIdView = findViewById(R.id.cardIdView);
+            cardIdView.setText(contents);
 
-        if (letterBitmap != null) {
-            thumbnail.setImageBitmap(letterBitmap.getLetterTile());
-        } else {
-            thumbnail.setImageBitmap(null);
-        }
-
-        thumbnail.setMinimumWidth(thumbnail.getHeight());
-    }
-
-    private void showPart(String part) {
-        View cardPart = findViewById(R.id.cardPart);
-        View barcodePart = findViewById(R.id.barcodePart);
-
-        if (getString(R.string.card).equals(part)) {
-            cardPart.setVisibility(View.VISIBLE);
-            barcodePart.setVisibility(View.GONE);
-
-            // Explicitly hide barcode (fixes blurriness on redraw)
-            hideBarcode();
-        } else if (getString(R.string.barcode).equals(part)) {
-            cardPart.setVisibility(View.GONE);
-            barcodePart.setVisibility(View.VISIBLE);
-
-            // Redraw barcode due to size change (Visibility.GONE sets it to 0)
-            String formatString = barcodeTypeField.getText().toString();
-            if (formatString.isEmpty() || formatString.equals(getString(R.string.noBarcode))) {
-                hideBarcode();
-            } else {
-                generateBarcode(cardIdFieldView.getText().toString(), BarcodeFormat.valueOf(formatString));
-            }
-        } else {
-            throw new UnsupportedOperationException();
+            final TextView barcodeTypeField = findViewById(R.id.barcodeType);
+            // Set special NO_BARCODE value to prevent onResume from overwriting it
+            barcodeTypeField.setText(format.isEmpty() ? LoyaltyCardEditActivity.NO_BARCODE : format);
+            onResume();
         }
     }
 }

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

@@ -1,70 +1,65 @@
 package protect.card_locker;
 
+
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 
-import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Guideline;
+import androidx.core.graphics.ColorUtils;
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.core.view.MotionEventCompat;
 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.GestureDetector;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 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.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.android.material.tabs.TabLayout;
 import com.google.zxing.BarcodeFormat;
 
-import java.math.BigDecimal;
-import java.text.DateFormat;
 import java.util.List;
 
 import protect.card_locker.preferences.Settings;
 
-public class LoyaltyCardViewActivity extends AppCompatActivity
-{
-    private static final String TAG = "Catima";
 
+public class LoyaltyCardViewActivity extends AppCompatActivity implements GestureDetector.OnGestureListener
+{
+    private static final String TAG = "CardLocker";
+    private static final double LUMINANCE_MIDPOINT = 0.5;
+
+    FloatingActionButton FabAdd;
+    TabLayout tabLayout;
+    TabLayout.OnTabSelectedListener onTabSelectedListener;
     TextView cardIdFieldView;
-    BottomSheetBehavior behavior;
-    View bottomSheet;
-    ImageView bottomSheetButton;
     TextView noteView;
-    TextView groupsView;
-    TextView balanceView;
-    TextView expiryView;
+    View noteViewDivider;
     TextView storeName;
-    ImageButton maximizeButton;
     ImageView barcodeImage;
-    ImageButton minimizeButton;
     View collapsingToolbarLayout;
-    AppBarLayout appBarLayout;
     int loyaltyCardId;
     LoyaltyCard loyaltyCard;
+    List<LoyaltyCard> storeCards;
+    GestureDetectorCompat gestureDetector;
     boolean rotationEnabled;
     DBHelper db;
     ImportURIHelper importURIHelper;
@@ -73,14 +68,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     String cardIdString;
     BarcodeFormat format;
 
-    FloatingActionButton editButton;
-
-    Guideline centerGuideline;
-    SeekBar barcodeScaler;
-
-    boolean starred;
     boolean backgroundNeedsDarkIcons;
     boolean barcodeIsFullscreen = false;
+    ViewGroup.LayoutParams barcodeImageState;
 
     private void extractIntentFields(Intent intent)
     {
@@ -92,7 +82,6 @@ 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)
         {
@@ -117,101 +106,82 @@ 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);
-        bottomSheetButton = findViewById(R.id.bottomSheetButton);
-        noteView = findViewById(R.id.noteView);
-        groupsView = findViewById(R.id.groupsView);
-        balanceView = findViewById(R.id.balanceView);
-        expiryView = findViewById(R.id.expiryView);
-        storeName = findViewById(R.id.storeName);
-        maximizeButton = findViewById(R.id.maximizeButton);
-        barcodeImage = findViewById(R.id.barcode);
-        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() {
+        FabAdd = findViewById(R.id.fabAdd);
+        FabAdd.setOnClickListener(new View.OnClickListener() {
             @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);
-
-                redrawBarcodeAfterResize();
-                centerGuideline.setGuidelinePercent(0.5f * scale);
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {
-
-            }
-
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {
-
+            public void onClick(View view)
+            {
+                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putString("store", loyaltyCard.store);
+                intent.putExtras(bundle);
+                startActivity(intent);
+                finish();
             }
         });
+        tabLayout = findViewById(R.id.tabLayout);
+        onTabSelectedListener = new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                loyaltyCardId = storeCards.get(tab.getPosition()).id;
+                onResume();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {}
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {}
+        };
+        cardIdFieldView = findViewById(R.id.cardIdView);
+        noteView = findViewById(R.id.noteView);
+        noteViewDivider = findViewById(R.id.noteViewDivider);
+        storeName = findViewById(R.id.storeName);
+        barcodeImage = findViewById(R.id.barcode);
+        collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
 
         rotationEnabled = true;
 
+        gestureDetector = new GestureDetectorCompat(this, this);
+
+        // Restore active card id after rotation
+        if(savedInstanceState != null)
+        {
+            loyaltyCardId = savedInstanceState.getInt("id");
+            onResume();
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle savedInstanceState) {
+        // Save active card id before rotation
+        savedInstanceState.putInt("id", loyaltyCardId);
+
+        super.onSaveInstanceState(savedInstanceState);
+
         // Allow making barcode fullscreen on tap
-        maximizeButton.setOnClickListener(v -> setFullscreen(true));
-        barcodeImage.setOnClickListener(view -> {
-            if (barcodeIsFullscreen)
-            {
-                setFullscreen(false);
-            }
-            else
-            {
-                setFullscreen(true);
-            }
-        });
-        minimizeButton.setOnClickListener(v -> setFullscreen(false));
-
-        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();
-        });
-
-        behavior = BottomSheetBehavior.from(bottomSheet);
-        behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
+        barcodeImage.setOnClickListener(new View.OnClickListener() {
             @Override
-            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);
-                    editButton.show();
+            public void onClick(View view) {
+                if(barcodeIsFullscreen)
+                {
+                    setFullscreen(false);
+                }
+                else
+                {
+                    setFullscreen(true);
                 }
-            }
-
-            @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);
             }
         });
     }
@@ -232,28 +202,23 @@ 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)
+        if(window != null && settings.useMaxBrightnessDisplayingBarcode())
         {
             WindowManager.LayoutParams attributes = window.getAttributes();
-
-            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);
-            }
-
+            attributes.screenBrightness = 1F;
             window.setAttributes(attributes);
         }
 
@@ -266,7 +231,37 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             return;
         }
 
-        setupOrientation();
+        storeCards = db.getLoyaltyCardsForStore(loyaltyCard.store);
+        tabLayout.removeOnTabSelectedListener(onTabSelectedListener);
+        tabLayout.removeAllTabs();
+        for(int i = 0; i < storeCards.size(); i++)
+        {
+            LoyaltyCard storeCard = storeCards.get(i);
+
+            // Use only first line of note
+            String loyaltyCardText = storeCard.note.split("\\r?\\n")[0].trim();
+            if(loyaltyCardText.isEmpty())
+            {
+                loyaltyCardText = String.valueOf(i + 1);
+            }
+            else if(loyaltyCardText.length() > 15)
+            {
+                // Shorten long notes
+                loyaltyCardText = loyaltyCardText.substring(0, 15).trim() + "…";
+            }
+
+            tabLayout.addTab(tabLayout.newTab().setText(loyaltyCardText));
+
+            if(storeCard.id == loyaltyCardId)
+            {
+                tabLayout.getTabAt(i).select();
+            }
+        }
+        tabLayout.addOnTabSelectedListener(onTabSelectedListener);
+        if(tabLayout.getTabCount() > 1)
+        {
+            tabLayout.setVisibility(View.VISIBLE);
+        }
 
         String formatString = loyaltyCard.barcodeType;
         format = !formatString.isEmpty() ? BarcodeFormat.valueOf(formatString) : null;
@@ -279,63 +274,33 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         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.setVisibility(View.VISIBLE);
+            noteViewDivider.setVisibility(View.VISIBLE);
         }
         else
         {
             noteView.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()));
-        }
-        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)));
-        }
-        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)));
-        }
-        else
-        {
-            expiryView.setVisibility(View.GONE);
-        }
-        expiryView.setTag(loyaltyCard.expiry);
-
-        if (!barcodeIsFullscreen) {
-            makeBottomSheetVisibleIfUseful();
+            noteViewDivider.setVisibility(View.GONE);
         }
 
         storeName.setText(loyaltyCard.store);
         storeName.setTextSize(settings.getCardTitleFontSize());
 
+        int textColor;
+        if(loyaltyCard.headerTextColor != null)
+        {
+            textColor = loyaltyCard.headerTextColor;
+        }
+        else
+        {
+            textColor = Color.WHITE;
+        }
+        storeName.setTextColor(textColor);
+
         int backgroundHeaderColor;
         if(loyaltyCard.headerColor != null)
         {
@@ -347,22 +312,9 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
 
         collapsingToolbarLayout.setBackgroundColor(backgroundHeaderColor);
-        appBarLayout.setBackgroundColor(backgroundHeaderColor);
-
-        int textColor;
-        if(Utils.needsDarkForeground(backgroundHeaderColor))
-        {
-            textColor = Color.BLACK;
-        }
-        else
-        {
-            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);
+        backgroundNeedsDarkIcons = (ColorUtils.calculateLuminance(backgroundHeaderColor) > LUMINANCE_MIDPOINT);
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
         {
@@ -384,30 +336,34 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
 
         if(format != null)
         {
-            if (!barcodeIsFullscreen) {
-                maximizeButton.setVisibility(View.VISIBLE);
-            }
-            barcodeImage.setVisibility(View.VISIBLE);
+            findViewById(R.id.barcode).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.
-                redrawBarcodeAfterResize();
+                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();
+                            }
+                        });
             }
             else
             {
                 Log.d(TAG, "ImageView size known known, creating barcode");
                 new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
             }
-
-            // Force redraw fullscreen state
-            setFullscreen(barcodeIsFullscreen);
         }
         else
         {
-            maximizeButton.setVisibility(View.GONE);
-            barcodeImage.setVisibility(View.GONE);
+            findViewById(R.id.barcode).setVisibility(View.INVISIBLE);
         }
     }
 
@@ -420,6 +376,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         }
 
         super.onBackPressed();
+        return;
     }
 
     @Override
@@ -436,29 +393,12 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
             item.setVisible(false);
         }
 
-        loyaltyCard = db.getLoyaltyCard(loyaltyCardId);
-        starred = loyaltyCard.starStatus != 0;
-
         menu.findItem(R.id.action_share).setIcon(getIcon(R.drawable.ic_share_white, backgroundNeedsDarkIcons));
+        menu.findItem(R.id.action_edit).setIcon(getIcon(R.drawable.ic_mode_edit_white_24dp, backgroundNeedsDarkIcons));
 
         return super.onCreateOptionsMenu(menu);
     }
 
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        if (starred) {
-            menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_starred_white, backgroundNeedsDarkIcons));
-            menu.findItem(R.id.action_star_unstar).setTitle(R.string.unstar);
-        }
-        else {
-            menu.findItem(R.id.action_star_unstar).setIcon(getIcon(R.drawable.ic_unstarred_white, backgroundNeedsDarkIcons));
-            menu.findItem(R.id.action_star_unstar).setTitle(R.string.star);
-        }
-        return true;
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item)
     {
@@ -474,6 +414,16 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 importURIHelper.startShareIntent(loyaltyCard);
                 return true;
 
+            case R.id.action_edit:
+                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();
+                return true;
+
             case R.id.action_lock_unlock:
                 if(rotationEnabled)
                 {
@@ -485,51 +435,11 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 }
                 rotationEnabled = !rotationEnabled;
                 return true;
-
-            case R.id.action_star_unstar:
-                starred = !starred;
-                db.updateLoyaltyCardStarStatus(loyaltyCardId, starred ? 1 : 0);
-                invalidateOptionsMenu();
-                return true;
         }
 
         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)
@@ -543,35 +453,57 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
         {
             item.setIcon(getIcon(R.drawable.ic_lock_open_white_24dp, backgroundNeedsDarkIcons));
             item.setTitle(R.string.lockScreen);
-            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
         }
     }
 
-    private void makeBottomSheetVisibleIfUseful()
-    {
-        if (noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || balanceView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
-            bottomSheet.setVisibility(View.VISIBLE);
+    // Gesture detection
+    @Override
+    public boolean onDown(MotionEvent motionEvent) {
+        return false;
+    }
+
+    @Override
+    public void onShowPress(MotionEvent motionEvent) {}
+
+    @Override
+    public boolean onSingleTapUp(MotionEvent motionEvent) {
+        return false;
+    }
+
+    @Override
+    public boolean onScroll(MotionEvent motionEvent, MotionEvent motionEvent1, float v, float v1) {
+        return false;
+    }
+
+    @Override
+    public void onLongPress(MotionEvent motionEvent) { }
+
+    @Override
+    public boolean onFling(MotionEvent motionEvent, MotionEvent motionEvent1, float v, float v1) {
+        int currentTab = tabLayout.getSelectedTabPosition();
+
+        if (motionEvent1.getX() > motionEvent.getX())
+        {
+            // Swipe left
+            int nextTab = currentTab == 0 ? tabLayout.getTabCount() - 1 : currentTab - 1;
+            tabLayout.getTabAt(nextTab).select();
         }
         else
         {
-            bottomSheet.setVisibility(View.GONE);
+            // Swipe right
+            int nextTab = currentTab < (tabLayout.getTabCount() - 1) ? currentTab + 1 : 0;
+            tabLayout.getTabAt(nextTab).select();
         }
+
+        return true;
     }
 
-    private void redrawBarcodeAfterResize()
+    @Override
+    public boolean onTouchEvent(MotionEvent motionEvent)
     {
-        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, cardIdString, format).execute();
-                        }
-                    });
-        };
+        gestureDetector.onTouchEvent(motionEvent);
+        return super.onTouchEvent(motionEvent);
     }
 
     /**
@@ -583,16 +515,10 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
     private void setFullscreen(boolean enable)
     {
         ActionBar actionBar = getSupportActionBar();
-        if(enable)
+        if(enable && !barcodeIsFullscreen)
         {
-            Log.d(TAG, "Move into of fullscreen");
-            // 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);
+            // Save previous barcodeImage state
+            barcodeImageState = barcodeImage.getLayoutParams();
 
             // Hide actionbar
             if(actionBar != null)
@@ -600,73 +526,49 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                 actionBar.hide();
             }
 
-            // 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);
-            appBarLayout.setPadding(0, 0, 0, 0);
+            // Hide collapsingToolbar
             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);
+
             // Set current state
             barcodeIsFullscreen = true;
         }
-        else if(!enable)
+        else if(!enable && barcodeIsFullscreen)
         {
-            Log.d(TAG, "Move out of fullscreen");
-
-            // Reset center guideline
-            barcodeScaler.setProgress(100);
-
-            // Prepare redraw after size change
-            redrawBarcodeAfterResize();
-
-            // Show maximize and hide minimize button and scaler
-            maximizeButton.setVisibility(View.VISIBLE);
-            minimizeButton.setVisibility(View.GONE);
-            barcodeScaler.setVisibility(View.GONE);
-
             // Show actionbar
             if(actionBar != null)
             {
                 actionBar.show();
             }
 
-            // Show appropriate toolbar
-            // And restore 24dp paddingTop for appBarLayout
-            appBarLayout.setVisibility(View.VISIBLE);
-            DisplayMetrics metrics = new DisplayMetrics();
-            getWindowManager().getDefaultDisplay().getMetrics(metrics);
-            appBarLayout.setPadding(0, (int) Math.ceil(metrics.density * 24), 0, 0);
-            setupOrientation();
-
-            // Show other UI elements
-            cardIdFieldView.setVisibility(View.VISIBLE);
-            makeBottomSheetVisibleIfUseful();
-            editButton.show();
+            // Show collapsingToolbar
+            collapsingToolbarLayout.setVisibility(View.VISIBLE);
 
             // 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);
+
             // Set current state
             barcodeIsFullscreen = false;
         }

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

@@ -1,46 +1,51 @@
 package protect.card_locker;
 
-import android.app.AlertDialog;
 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.ClipboardManager;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 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.app.AppCompatDelegate;
 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 java.util.List;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Calendar;
+import java.util.Map;
+
+import protect.card_locker.intro.IntroActivity;
 import protect.card_locker.preferences.SettingsActivity;
 
-public class MainActivity extends AppCompatActivity implements GestureDetector.OnGestureListener
+public class MainActivity extends AppCompatActivity
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
+    private static final int MAIN_REQUEST_CODE = 1;
 
     private Menu menu;
-    private GestureDetector gestureDetector;
+    private FloatingActionButton fabAdd;
     protected String filter = "";
-    protected int selectedTab = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
@@ -50,74 +55,22 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        updateLoyaltyCardList(filter, null);
-
-        TabLayout groupsTabLayout = findViewById(R.id.groups);
-        groupsTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+        fabAdd = findViewById(R.id.fabAdd);
+        fabAdd.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                selectedTab = tab.getPosition();
-                updateLoyaltyCardList(filter, tab.getTag());
-
-                // Store active tab in Shared Preference to restore next app launch
-                SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
-                        getString(R.string.sharedpreference_active_tab),
-                        Context.MODE_PRIVATE);
-                SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
-                activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), selectedTab);
-                activeTabPrefEditor.apply();
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
+            public void onClick(View view) {
+                Intent i = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+                startActivityForResult(i, MAIN_REQUEST_CODE);
             }
         });
 
-        gestureDetector = new GestureDetector(this, this);
+        updateLoyaltyCardList("");
 
-        View.OnTouchListener gestureTouchListener = new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(final View v, final MotionEvent event){
-                return gestureDetector.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);
-
-        // 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.thank_you, 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();
-        };
+        SharedPreferences prefs = getSharedPreferences("protect.card_locker", MODE_PRIVATE);
+        if (prefs.getBoolean("firstrun", true)) {
+            startIntro();
+            prefs.edit().putBoolean("firstrun", false).commit();
+        }
     }
 
     @Override
@@ -133,46 +86,15 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             }
         }
 
-        // Start of active tab logic
-        TabLayout groupsTabLayout = findViewById(R.id.groups);
-        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(selectedTab);
-            if (tab == null) {
-                tab = groupsTabLayout.getTabAt(0);
-            }
-
-            groupsTabLayout.selectTab(tab);
-            assert tab != null;
-            group = tab.getTag();
-        }
-        updateLoyaltyCardList(filter, 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(), ScanActivity.class);
-                startActivityForResult(i, Utils.BARCODE_SCAN);
-            }
-        });
+        updateLoyaltyCardList(filter);
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode == Utils.MAIN_REQUEST) {
+        if (requestCode == MAIN_REQUEST_CODE)
+        {
             // 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 = "";
@@ -184,19 +106,6 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
 
             // In case the theme changed
             recreate();
-
-            return;
-        }
-
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
-
-        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);
         }
     }
 
@@ -213,31 +122,17 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         if (!searchView.isIconified()) {
             searchView.setIconified(true);
         } else {
-            TabLayout groupsTabLayout = findViewById(R.id.groups);
-
-            if (groupsTabLayout.getVisibility() == View.VISIBLE && selectedTab != 0) {
-                selectedTab = 0;
-                groupsTabLayout.selectTab(groupsTabLayout.getTabAt(0));
-            } else {
-                super.onBackPressed();
-            }
+            super.onBackPressed();
         }
     }
 
-    private void updateLoyaltyCardList(String filterText, Object tag)
+    private void updateLoyaltyCardList(String filterText)
     {
-        Group group = null;
-        if (tag != null) {
-            group = (Group) tag;
-        }
-
         final ListView cardList = findViewById(R.id.list);
         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);
-
         if(db.getLoyaltyCardCount() > 0)
         {
             // We want the cardList to be visible regardless of the filtered match count
@@ -245,7 +140,7 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             // the keyboard
             cardList.setVisibility(View.VISIBLE);
             helpText.setVisibility(View.GONE);
-            if(cardCursor.getCount() > 0)
+            if(db.getLoyaltyCardCount(filterText) > 0)
             {
                 noMatchingCardsText.setVisibility(View.GONE);
             }
@@ -261,6 +156,8 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             noMatchingCardsText.setVisibility(View.GONE);
         }
 
+        Cursor cardCursor = db.getOneLoyaltyCardPerStoreCursor(filterText);
+
         final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor);
         cardList.setAdapter(adapter);
 
@@ -282,48 +179,11 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
 
                 ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard, i);
 
-                startActivityForResult(i, Utils.MAIN_REQUEST);
+                startActivityForResult(i, MAIN_REQUEST_CODE);
             }
         });
     }
 
-    public void updateTabGroups(TabLayout groupsTabLayout)
-    {
-        final DBHelper db = new DBHelper(this);
-
-        List<Group> newGroups = db.getGroups();
-
-        if (newGroups.size() == 0) {
-            groupsTabLayout.removeAllTabs();
-            groupsTabLayout.setVisibility(View.GONE);
-            return;
-        }
-
-        groupsTabLayout.removeAllTabs();
-
-        TabLayout.Tab allTab = groupsTabLayout.newTab();
-        allTab.setText(R.string.all);
-        allTab.setTag(null);
-        groupsTabLayout.addTab(allTab, false);
-
-        for (Group group : newGroups) {
-            TabLayout.Tab tab = groupsTabLayout.newTab();
-            tab.setText(group._id);
-            tab.setTag(group);
-            groupsTabLayout.addTab(tab, false);
-        }
-
-        groupsTabLayout.setVisibility(View.VISIBLE);
-    }
-
-    private void openPrivacyPolicy() {
-        Intent browserIntent = new Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse("https://thelastproject.github.io/Catima/privacy-policy")
-        );
-        startActivity(browserIntent);
-    }
-
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo)
     {
@@ -344,20 +204,23 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
         Cursor cardCursor = (Cursor)listView.getItemAtPosition(info.position);
         LoyaltyCard card = LoyaltyCard.toLoyaltyCard(cardCursor);
 
-        if(item.getItemId() == R.id.action_clipboard)
+        if(card != null)
         {
-            ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-            ClipData clip = ClipData.newPlainText(card.store, card.cardId);
-            clipboard.setPrimaryClip(clip);
+            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;
+                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);
@@ -393,15 +256,7 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
                 @Override
                 public boolean onQueryTextChange(String newText) {
                     filter = newText;
-
-                    TabLayout groupsTabLayout = findViewById(R.id.groups);
-                    TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
-
-                    updateLoyaltyCardList(
-                        newText,
-                        currentTab != null ? currentTab.getTag() : null
-                    );
-
+                    updateLoyaltyCardList(newText);
                     return true;
                 }
             });
@@ -415,117 +270,135 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
     {
         int id = item.getItemId();
 
-        if (id == R.id.action_manage_groups)
-        {
-            Intent i = new Intent(getApplicationContext(), ManageGroupsActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
-            return true;
-        }
-
         if(id == R.id.action_import_export)
         {
             Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            startActivityForResult(i, MAIN_REQUEST_CODE);
             return true;
         }
 
         if(id == R.id.action_settings)
         {
             Intent i = new Intent(getApplicationContext(), SettingsActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            startActivityForResult(i, MAIN_REQUEST_CODE);
             return true;
         }
 
-        if(id == R.id.action_privacy_policy)
+        if(id == R.id.action_intro)
         {
-            openPrivacyPolicy();
+            startIntro();
             return true;
         }
 
         if(id == R.id.action_about)
         {
-            Intent i = new Intent(getApplicationContext(), AboutActivity.class);
-            startActivityForResult(i, Utils.MAIN_REQUEST);
+            displayAboutDialog();
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
-    protected static boolean isDarkModeEnabled(Context inputContext)
+    private void displayAboutDialog()
     {
-        Configuration config = inputContext.getResources().getConfiguration();
+        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())
+        {
+            libs.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
+        }
+        libs.append("</ul>");
+
+        StringBuilder resources = new StringBuilder().append("<ul>");
+        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
+        {
+            resources.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
+        }
+        resources.append("</ul>");
+
+        String appName = getString(R.string.app_name);
+        int year = Calendar.getInstance().get(Calendar.YEAR);
+
+        String version = "?";
+        try
+        {
+            PackageInfo pi = getPackageManager().getPackageInfo(getPackageName(), 0);
+            version = pi.versionName;
+        }
+        catch (PackageManager.NameNotFoundException e)
+        {
+            Log.w(TAG, "Package name not found", e);
+        }
+
+        WebView wv = new WebView(this);
+
+        // Set CSS for dark mode if dark mode
+        String css = "";
+        Configuration config = getResources().getConfiguration();
         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;
+        if(currentNightMode == Configuration.UI_MODE_NIGHT_YES)
+        {
+            css = "<style>body {color:white; background-color:black;}</style>";
         }
 
-        TabLayout groupsTabLayout = findViewById(R.id.groups);
-        if (groupsTabLayout.getTabCount() < 2) {
-            return false;
-        }
+        String html =
+            "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\" />" +
+            css +
+            "<img src=\"file:///android_res/mipmap/ic_launcher.png\" alt=\"" + appName + "\"/>" +
+            "<h1>" +
+            String.format(getString(R.string.about_title_fmt),
+                    "<a href=\"" + getString(R.string.app_webpage_url)) + "\">" +
+            appName +
+            "</a>" +
+            "</h1><p>" +
+            appName +
+            " " +
+            String.format(getString(R.string.debug_version_fmt), version) +
+            "</p><p>" +
+            String.format(getString(R.string.app_revision_fmt),
+                    "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
+                            getString(R.string.app_revision_url) +
+                            "</a>") +
+            "</p><hr/><p>" +
+            String.format(getString(R.string.app_copyright_fmt), year) +
+            "</p><hr/><p>" +
+            getString(R.string.app_license) +
+            "</p><hr/><p>" +
+            String.format(getString(R.string.app_libraries), appName, libs.toString()) +
+            "</p><hr/><p>" +
+            String.format(getString(R.string.app_resources), appName, resources.toString());
 
-        Integer currentTab = groupsTabLayout.getSelectedTabPosition();
+        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();
+    }
 
-        // 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;
+    private void startIntro()
+    {
+        Intent intent = new Intent(this, IntroActivity.class);
+        startActivityForResult(intent, MAIN_REQUEST_CODE);
     }
 }

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

@@ -1,255 +0,0 @@
-package protect.card_locker;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.text.InputType;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import java.util.List;
-
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
-public class ManageGroupsActivity extends AppCompatActivity
-{
-    private static final String TAG = "Catima";
-
-    private final DBHelper db = new DBHelper(this);
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.manage_groups_activity);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
-        updateGroupList();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        updateGroupList();
-
-        FloatingActionButton addButton = findViewById(R.id.fabAdd);
-        addButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                createGroup();
-            }
-        });
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-    }
-
-    private void updateGroupList()
-    {
-        final ListView groupList = findViewById(R.id.list);
-        final TextView helpText = findViewById(R.id.helpText);
-        final DBHelper db = new DBHelper(this);
-
-        if(db.getGroupCount() > 0)
-        {
-            groupList.setVisibility(View.VISIBLE);
-            helpText.setVisibility(View.GONE);
-        }
-        else
-        {
-            groupList.setVisibility(View.GONE);
-            helpText.setVisibility(View.VISIBLE);
-        }
-
-        Cursor groupCursor = db.getGroupCursor();
-
-        final GroupCursorAdapter adapter = new GroupCursorAdapter(this, groupCursor);
-        groupList.setAdapter(adapter);
-
-        registerForContextMenu(groupList);
-    }
-
-    private void invalidateHomescreenActiveTab()
-    {
-        SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
-                getString(R.string.sharedpreference_active_tab),
-                Context.MODE_PRIVATE);
-        SharedPreferences.Editor activeTabPrefEditor = activeTabPref.edit();
-        activeTabPrefEditor.putInt(getString(R.string.sharedpreference_active_tab), 0);
-        activeTabPrefEditor.apply();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        int id = item.getItemId();
-
-        if (id == android.R.id.home) {
-            finish();
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    public void moveGroupUp(View view) {
-        moveGroup(view, true);
-    }
-
-    public void moveGroupDown(View view) {
-        moveGroup(view, false);
-    }
-
-    public void editGroup(View view) {
-        final String groupName = getGroupname(view);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.enter_group_name);
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        input.setText(groupName);
-        builder.setView(input);
-
-        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                db.updateGroup(groupName, input.getText().toString());
-                updateGroupList();
-            }
-        });
-        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
-        });
-        AlertDialog dialog = builder.create();
-        dialog.show();
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        input.requestFocus();
-    }
-
-    public void deleteGroup(View view) {
-        final String groupName = getGroupname(view);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.deleteConfirmationGroup);
-        builder.setMessage(groupName);
-
-        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                db.deleteGroup(groupName);
-                updateGroupList();
-                // Delete may change ordering, so invalidate
-                invalidateHomescreenActiveTab();
-            }
-        });
-        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
-        });
-        AlertDialog dialog = builder.create();
-        dialog.show();
-    }
-
-    private void createGroup() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle(R.string.enter_group_name);
-        final EditText input = new EditText(this);
-        input.setInputType(InputType.TYPE_CLASS_TEXT);
-        builder.setView(input);
-
-        builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                db.insertGroup(input.getText().toString());
-                updateGroupList();
-            }
-        });
-        builder.setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                dialog.cancel();
-            }
-        });
-        AlertDialog dialog = builder.create();
-        dialog.show();
-        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        input.requestFocus();
-    }
-
-    private String getGroupname(View view) {
-        LinearLayout parentRow = (LinearLayout) view.getParent().getParent();
-        TextView groupNameTextView = parentRow.findViewById(R.id.name);
-        return (String) groupNameTextView.getText();
-    }
-
-    private void moveGroup(View view, boolean up) {
-        final String groupName = getGroupname(view);
-
-        List<Group> groups = db.getGroups();
-
-        int currentIndex = -1;
-        Integer newIndex;
-
-        // Get current index in group list
-        for (int i = 0; i < groups.size(); i++) {
-            if (groups.get(i)._id.equals(groupName)) {
-                currentIndex = i;
-
-                break;
-            }
-        }
-
-        if (currentIndex == -1) {
-            throw new IndexOutOfBoundsException();
-        }
-
-        // Reinsert group in correct position
-        if (up) {
-            newIndex = currentIndex - 1;
-        } else {
-            newIndex = currentIndex + 1;
-        }
-
-        // Don't try to move out of bounds
-        if (newIndex < 0 || newIndex >= groups.size()) {
-            return;
-        }
-
-        Group group = groups.remove(currentIndex);
-        groups.add(newIndex, group);
-
-        // Update database
-        db.reorderGroups(groups);
-
-        // Update UI
-        updateGroupList();
-
-        // Ordering may have changed, so invalidate
-        invalidateHomescreenActiveTab();
-    }
-}

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

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

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

@@ -1,22 +1,13 @@
-package protect.card_locker.importexport;
+package protect.card_locker;
 
 import android.util.Log;
 
-import org.json.JSONException;
-
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.text.ParseException;
-
-import protect.card_locker.DBHelper;
-import protect.card_locker.DataFormat;
-import protect.card_locker.FormatException;
-import protect.card_locker.importexport.CsvDatabaseImporter;
-import protect.card_locker.importexport.DatabaseImporter;
 
 public class MultiFormatImporter
 {
-    private static final String TAG = "Catima";
+    private static final String TAG = "LoyaltyCardLocker";
 
     /**
      * Attempts to import data from the input stream of the
@@ -35,31 +26,37 @@ public class MultiFormatImporter
 
         switch(format)
         {
-            case Catima:
+            case CSV:
                 importer = new CsvDatabaseImporter();
                 break;
-            case VoucherVault:
-                importer = new VoucherVaultImporter();
-                break;
         }
 
-        if (importer != null)
+        if(importer != null)
         {
             try
             {
                 importer.importData(db, input);
                 return true;
             }
-            catch(IOException | FormatException | InterruptedException | JSONException | ParseException e)
+            catch(IOException e)
             {
-                Log.e(TAG, "Failed to import data", 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;
         }
-        return false;
     }
 }

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

@@ -1,157 +0,0 @@
-package protect.card_locker;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MenuItem;
-import android.view.View;
-
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.Intents;
-import com.journeyapps.barcodescanner.BarcodeCallback;
-import com.journeyapps.barcodescanner.BarcodeResult;
-import com.journeyapps.barcodescanner.CaptureManager;
-import com.journeyapps.barcodescanner.DecoratedBarcodeView;
-
-import java.util.List;
-
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-
-/**
- * Custom Scannner Activity extending from Activity to display a custom layout form scanner view.
- *
- * Based on https://github.com/journeyapps/zxing-android-embedded/blob/0fdfbce9fb3285e985bad9971c5f7c0a7a334e7b/sample/src/main/java/example/zxing/CustomScannerActivity.java
- * originally licensed under Apache 2.0
- */
-public class ScanActivity extends AppCompatActivity {
-    private static final String TAG = "Catima";
-
-    private CaptureManager capture;
-    private DecoratedBarcodeView barcodeScannerView;
-
-    private String cardId;
-
-    private void extractIntentFields(Intent intent) {
-        final Bundle b = intent.getExtras();
-        cardId = b != null ? b.getString("cardId") : null;
-        Log.d(TAG, "Scan activity: id=" + cardId);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.scan_activity);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        if(actionBar != null)
-        {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
-        extractIntentFields(getIntent());
-
-        barcodeScannerView = findViewById(R.id.zxing_barcode_scanner);
-
-        // Even though we do the actual decoding with the barcodeScannerView
-        // CaptureManager needs to be running to show the camera and scanning bar
-        capture = new CaptureManager(this, barcodeScannerView);
-        Intent captureIntent = new Intent();
-        Bundle captureIntentBundle = new Bundle();
-        captureIntentBundle.putBoolean(Intents.Scan.BEEP_ENABLED, false);
-        captureIntent.putExtras(captureIntentBundle);
-        capture.initializeFromIntent(captureIntent, savedInstanceState);
-
-        barcodeScannerView.decodeSingle(new BarcodeCallback() {
-            @Override
-            public void barcodeResult(BarcodeResult result) {
-                Intent scanResult = new Intent();
-                Bundle scanResultBundle = new Bundle();
-                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, result.getText());
-                scanResultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, result.getBarcodeFormat().toString());
-                scanResult.putExtras(scanResultBundle);
-                ScanActivity.this.setResult(RESULT_OK, scanResult);
-                finish();
-            }
-
-            @Override
-            public void possibleResultPoints(List<ResultPoint> resultPoints) {
-
-            }
-        });
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        capture.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        capture.onPause();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        capture.onDestroy();
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        capture.onSaveInstanceState(outState);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        if (item.getItemId() == android.R.id.home)
-        {
-            setResult(Activity.RESULT_CANCELED);
-            finish();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent intent)
-    {
-        super.onActivityResult(requestCode, resultCode, intent);
-
-        BarcodeValues barcodeValues = Utils.parseSetBarcodeActivityResult(requestCode, resultCode, intent);
-
-        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);
-    }
-}

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

@@ -1,144 +0,0 @@
-package protect.card_locker;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Color;
-import android.util.Log;
-
-import java.math.BigDecimal;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Currency;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-import java.util.Locale;
-
-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;
-
-    static final double LUMINANCE_MIDPOINT = 0.5;
-
-    static public LetterBitmap generateIcon(Context context, String store, Integer backgroundColor) {
-        if (store.length() == 0) {
-            return null;
-        }
-
-        int tileLetterFontSize = context.getResources().getDimensionPixelSize(R.dimen.tileLetterFontSize);
-        int pixelSize = context.getResources().getDimensionPixelSize(R.dimen.cardThumbnailSize);
-
-        if (backgroundColor == null) {
-            backgroundColor = LetterBitmap.getDefaultColor(context, store);
-        }
-
-        return new LetterBitmap(context, store, store,
-                tileLetterFontSize, pixelSize, pixelSize, backgroundColor, needsDarkForeground(backgroundColor) ? Color.BLACK : Color.WHITE);
-    }
-
-    static public boolean needsDarkForeground(Integer backgroundColor) {
-        return ColorUtils.calculateLuminance(backgroundColor) > LUMINANCE_MIDPOINT;
-    }
-
-    static public BarcodeValues parseSetBarcodeActivityResult(int requestCode, int resultCode, Intent intent) {
-        String contents = null;
-        String format = null;
-
-        if (resultCode == Activity.RESULT_OK)
-        {
-            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");
-            } else {
-                return new BarcodeValues(null, null);
-            }
-
-            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);
-    }
-
-    static public Boolean hasExpired(Date expiryDate) {
-        // today
-        Calendar date = new GregorianCalendar();
-        // reset hour, minutes, seconds and millis
-        date.set(Calendar.HOUR_OF_DAY, 0);
-        date.set(Calendar.MINUTE, 0);
-        date.set(Calendar.SECOND, 0);
-        date.set(Calendar.MILLISECOND, 0);
-
-        return expiryDate.before(date.getTime());
-    }
-
-    static public String formatBalance(Context context, BigDecimal value, Currency currency) {
-        NumberFormat numberFormat = NumberFormat.getInstance();
-
-        if (currency == null) {
-            numberFormat.setMaximumFractionDigits(0);
-            return context.getString(R.string.balancePoints, numberFormat.format(value));
-        }
-
-        NumberFormat currencyFormat = NumberFormat.getCurrencyInstance();
-        currencyFormat.setCurrency(currency);
-        currencyFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
-        currencyFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
-
-        return currencyFormat.format(value);
-    }
-
-    static public String formatBalanceWithoutCurrencySymbol(BigDecimal value, Currency currency) {
-        NumberFormat numberFormat = NumberFormat.getInstance();
-
-        if (currency == null) {
-            numberFormat.setMaximumFractionDigits(0);
-            return numberFormat.format(value);
-        }
-
-        numberFormat.setMinimumFractionDigits(currency.getDefaultFractionDigits());
-        numberFormat.setMaximumFractionDigits(currency.getDefaultFractionDigits());
-
-        return numberFormat.format(value);
-    }
-
-    static public Boolean currencyHasDecimals(Currency currency) {
-        if (currency == null) {
-            return false;
-        }
-
-        return currency.getDefaultFractionDigits() != 0;
-    }
-
-    static public BigDecimal parseCurrency(String value, Boolean hasDecimals) throws NumberFormatException {
-        // If there are no decimals expected, remove all separators before parsing
-        if (!hasDecimals) {
-            value = value.replaceAll("[^0-9]", "");
-            return new BigDecimal(value);
-        }
-
-        // There are many ways users can write a currency, so we fix it up a bit
-        // 1. Replace all non-numbers with dots
-        value = value.replaceAll("[^0-9]", ".");
-
-        // 2. Remove all but the last dot
-        while (value.split("\\.").length > 2) {
-            value = value.replaceFirst("\\.", "");
-        }
-
-        // Parse as BigDecimal
-        return new BigDecimal(value);
-    }
-}

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

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

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

@@ -1,377 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.database.sqlite.SQLiteDatabase;
-
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVParser;
-import org.apache.commons.csv.CSVRecord;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.math.BigDecimal;
-import java.util.Currency;
-import java.util.Date;
-import java.util.List;
-
-import protect.card_locker.DBHelper;
-import protect.card_locker.FormatException;
-import protect.card_locker.Group;
-
-/**
- * Class for importing a database from CSV (Comma Separate Values)
- * formatted data.
- *
- * The database's loyalty cards are expected to appear in the CSV data.
- * A header is expected for the each table showing the names of the columns.
- */
-public class CsvDatabaseImporter implements DatabaseImporter
-{
-    public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, InterruptedException
-    {
-        BufferedReader bufferedReader = new BufferedReader(input);
-
-        bufferedReader.mark(100);
-
-        Integer version = 1;
-
-        try {
-            version = Integer.parseInt(bufferedReader.readLine());
-        } catch (NumberFormatException _e) {
-            // Assume version 1
-        }
-
-        bufferedReader.reset();
-
-        switch (version) {
-            case 1:
-                parseV1(db, bufferedReader);
-                break;
-            case 2:
-                parseV2(db, bufferedReader);
-                break;
-            default:
-                throw new FormatException(String.format("No code to parse version %s", version));
-        }
-
-        bufferedReader.close();
-    }
-
-    public void parseV1(DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
-    {
-        final CSVParser parser = new CSVParser(input, CSVFormat.RFC4180.withHeader());
-
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
-        try
-        {
-            for (CSVRecord record : parser)
-            {
-                importLoyaltyCard(database, db, record);
-
-                if(Thread.currentThread().isInterrupted())
-                {
-                    throw new InterruptedException();
-                }
-            }
-
-            parser.close();
-            database.setTransactionSuccessful();
-        }
-        catch(IllegalArgumentException|IllegalStateException e)
-        {
-            throw new FormatException("Issue parsing CSV data", e);
-        }
-        finally
-        {
-            database.endTransaction();
-            database.close();
-        }
-    }
-
-    public void parseV2(DBHelper db, BufferedReader input) throws IOException, FormatException, InterruptedException
-    {
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
-        Integer part = 0;
-        String stringPart = "";
-
-        try {
-            while (true) {
-                String tmp = input.readLine();
-
-                if (tmp == null || tmp.isEmpty()) {
-                    switch (part) {
-                        case 0:
-                            // This is the version info, ignore
-                            break;
-                        case 1:
-                            parseV2Groups(db, database, stringPart);
-                            break;
-                        case 2:
-                            parseV2Cards(db, database, stringPart);
-                            break;
-                        case 3:
-                            parseV2CardGroups(db, database, stringPart);
-                            break;
-                        default:
-                            throw new FormatException("Issue parsing CSV data, too many parts for v2 parsing");
-                    }
-
-                    if (tmp == null) {
-                        break;
-                    }
-
-                    part += 1;
-                    stringPart = "";
-                } else {
-                    stringPart += tmp + "\n";
-                }
-            }
-            database.setTransactionSuccessful();
-        } catch (FormatException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            database.endTransaction();
-            database.close();
-        }
-    }
-
-    public void parseV2Groups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
-        // Parse groups
-        final CSVParser groupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
-
-        try {
-            for (CSVRecord record : groupParser) {
-                importGroup(database, db, record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            groupParser.close();
-        }
-    }
-
-    public void parseV2Cards(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
-        // Parse cards
-        final CSVParser cardParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
-
-        try {
-            for (CSVRecord record : cardParser) {
-                importLoyaltyCard(database, db, record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            cardParser.close();
-        }
-    }
-
-    public void parseV2CardGroups(DBHelper db, SQLiteDatabase database, String data) throws IOException, FormatException, InterruptedException
-    {
-        // Parse card group mappings
-        final CSVParser cardGroupParser = new CSVParser(new StringReader(data), CSVFormat.RFC4180.withHeader());
-
-        try {
-            for (CSVRecord record : cardGroupParser) {
-                importCardGroupMapping(database, db, record);
-
-                if (Thread.currentThread().isInterrupted()) {
-                    throw new InterruptedException();
-                }
-            }
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            throw new FormatException("Issue parsing CSV data", e);
-        } finally {
-            cardGroupParser.close();
-        }
-    }
-
-    /**
-     * 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);
-        }
-    }
-
-    /**
-     * 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.
-     */
-    private 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);
-        }
-    }
-
-    /**
-     * Import a single loyalty card into the database using the given
-     * session.
-     */
-    private void importLoyaltyCard(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        int id = extractInt(DBHelper.LoyaltyCardDbIds.ID, record, false);
-
-        String store = extractString(DBHelper.LoyaltyCardDbIds.STORE, record, "");
-        if(store.isEmpty())
-        {
-            throw new FormatException("No store listed, but is required");
-        }
-
-        String note = extractString(DBHelper.LoyaltyCardDbIds.NOTE, record, "");
-        Date expiry = null;
-        try {
-            expiry = new Date(extractLong(DBHelper.LoyaltyCardDbIds.EXPIRY, record, true));
-        } catch (NullPointerException | FormatException e) { }
-
-        BigDecimal balance;
-        try {
-            balance = new BigDecimal(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 = extractString(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE, record, "");
-        if(!unparsedBalanceType.isEmpty()) {
-            balanceType = Currency.getInstance(unparsedBalanceType);
-        }
-
-        String cardId = extractString(DBHelper.LoyaltyCardDbIds.CARD_ID, record, "");
-        if(cardId.isEmpty())
-        {
-            throw new FormatException("No card ID listed, but is required");
-        }
-
-        String barcodeType = extractString(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, record, "");
-
-        Integer headerColor = null;
-
-        if(record.isMapped(DBHelper.LoyaltyCardDbIds.HEADER_COLOR))
-        {
-            headerColor = extractInt(DBHelper.LoyaltyCardDbIds.HEADER_COLOR, record, true);
-        }
-
-        int starStatus = 0;
-        try {
-            starStatus = extractInt(DBHelper.LoyaltyCardDbIds.STAR_STATUS, record, false);
-        } catch (FormatException _e ) {
-            // This field did not exist in versions 0.28 and before
-            // We catch this exception so we can still import old backups
-        }
-        if (starStatus != 1) starStatus = 0;
-        helper.insertLoyaltyCard(database, id, store, note, expiry, balance, balanceType, cardId, barcodeType, headerColor, starStatus);
-    }
-
-    /**
-     * Import a single group into the database using the given
-     * session.
-     */
-    private void importGroup(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        String id = extractString(DBHelper.LoyaltyCardDbGroups.ID, record, null);
-
-        helper.insertGroup(database, id);
-    }
-
-    /**
-     * Import a single card to group mapping into the database using the given
-     * session.
-     */
-    private void importCardGroupMapping(SQLiteDatabase database, DBHelper helper, CSVRecord record)
-            throws IOException, FormatException
-    {
-        Integer cardId = extractInt(DBHelper.LoyaltyCardDbIdsGroups.cardID, record, false);
-        String groupId = extractString(DBHelper.LoyaltyCardDbIdsGroups.groupID, record, null);
-
-        List<Group> cardGroups = helper.getLoyaltyCardGroups(cardId);
-        cardGroups.add(helper.getGroup(groupId));
-        helper.setLoyaltyCardGroups(database, cardId, cardGroups);
-    }
-}

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

@@ -1,132 +0,0 @@
-package protect.card_locker.importexport;
-
-import android.annotation.SuppressLint;
-import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Color;
-
-import com.google.zxing.BarcodeFormat;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Currency;
-import java.util.Date;
-import java.util.TimeZone;
-
-import protect.card_locker.DBHelper;
-import protect.card_locker.FormatException;
-
-/**
- * Class for importing a database from CSV (Comma Separate Values)
- * formatted data.
- *
- * The database's loyalty cards are expected to appear in the CSV data.
- * A header is expected for the each table showing the names of the columns.
- */
-public class VoucherVaultImporter implements DatabaseImporter
-{
-    public void importData(DBHelper db, InputStreamReader input) throws IOException, FormatException, JSONException, ParseException {
-        BufferedReader bufferedReader = new BufferedReader(input);
-
-        StringBuilder sb = new StringBuilder();
-        String line;
-        while ((line = bufferedReader.readLine()) != null) {
-            sb.append(line);
-        }
-        JSONArray jsonArray = new JSONArray(sb.toString());
-
-        SQLiteDatabase database = db.getWritableDatabase();
-        database.beginTransaction();
-
-        // See https://github.com/tim-smart/vouchervault/issues/4#issuecomment-788226503 for more info
-        for (int i = 0; i < jsonArray.length(); i++) {
-            JSONObject jsonCard = jsonArray.getJSONObject(i);
-
-            String store = jsonCard.getString("description");
-
-            Date expiry = null;
-            if (!jsonCard.isNull("expires")) {
-                @SuppressLint("SimpleDateFormat") SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
-                dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-                expiry = dateFormat.parse(jsonCard.getString("expires"));
-            }
-
-            BigDecimal balance;
-            if (!jsonCard.isNull("balance")) {
-                balance = new BigDecimal(String.valueOf(jsonCard.getDouble("balance")));
-            } else {
-                balance = new BigDecimal("0");
-            }
-
-            Currency balanceType = Currency.getInstance("USD");
-
-            String cardId = jsonCard.getString("code");
-
-            String barcodeType = null;
-
-            String codeTypeFromJSON = jsonCard.getString("codeType");
-            switch (codeTypeFromJSON) {
-                case "CODE128":
-                    barcodeType = BarcodeFormat.CODE_128.name();
-                    break;
-                case "CODE39":
-                    barcodeType = BarcodeFormat.CODE_39.name();
-                    break;
-                case "EAN13":
-                    barcodeType = BarcodeFormat.EAN_13.name();
-                    break;
-                case "QR":
-                    barcodeType = BarcodeFormat.QR_CODE.name();
-                    break;
-                case "TEXT":
-                    break;
-                default:
-                    throw new FormatException("Unknown barcode type found: " + codeTypeFromJSON);
-            }
-
-            int headerColor;
-
-            String colorFromJSON = jsonCard.getString("color");
-            switch (colorFromJSON) {
-                case "GREY":
-                    headerColor = Color.GRAY;
-                    break;
-                case "BLUE":
-                    headerColor = Color.BLUE;
-                    break;
-                case "GREEN":
-                    headerColor = Color.GREEN;
-                    break;
-                case "ORANGE":
-                    headerColor = Color.rgb(255, 165, 0);
-                    break;
-                case "PURPLE":
-                    headerColor = Color.rgb(128, 0, 128);
-                    break;
-                case "RED":
-                    headerColor = Color.RED;
-                    break;
-                case "YELLOW":
-                    headerColor = Color.YELLOW;
-                    break;
-                default:
-                    throw new FormatException("Unknown colour type foun: " + colorFromJSON);
-            }
-
-            db.insertLoyaltyCard(store, "", expiry, balance, balanceType, cardId, barcodeType, headerColor, 0);
-        }
-
-        database.setTransactionSuccessful();
-        database.endTransaction();
-        database.close();
-
-        bufferedReader.close();
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@ package protect.card_locker.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import androidx.preference.PreferenceManager;
+import android.preference.PreferenceManager;
 import androidx.annotation.IntegerRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -81,6 +81,11 @@ public class Settings
         return getInt(R.string.settings_key_card_id_font_size, R.integer.settings_card_id_font_size_sp);
     }
 
+    public int getCardNoteFontSize()
+    {
+        return getInt(R.string.settings_key_card_note_font_size, R.integer.settings_card_note_font_size_sp);
+    }
+
     public boolean useMaxBrightnessDisplayingBarcode()
     {
         return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
@@ -90,14 +95,4 @@ 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);
-    }
 }

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

@@ -1,17 +1,13 @@
 package protect.card_locker.preferences;
 
 import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import android.view.MenuItem;
 
-import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
-import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.R;
 
 public class SettingsActivity extends AppCompatActivity
@@ -24,11 +20,11 @@ public class SettingsActivity extends AppCompatActivity
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null)
         {
-            actionBar.setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
 
         // Display the fragment as the main content.
-        getSupportFragmentManager().beginTransaction()
+        getFragmentManager().beginTransaction()
                 .replace(android.R.id.content, new SettingsFragment())
                 .commit();
     }
@@ -47,18 +43,17 @@ public class SettingsActivity extends AppCompatActivity
         return super.onOptionsItemSelected(item);
     }
 
-    public static class SettingsFragment extends PreferenceFragmentCompat
+    public static class SettingsFragment extends PreferenceFragment
     {
-        private static final String DIALOG_FRAGMENT_TAG = "SettingsFragment";
         @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey)
+        public void onCreate(final Bundle savedInstanceState)
         {
+            super.onCreate(savedInstanceState);
+
             // Load the preferences from an XML resource
             addPreferencesFromResource(R.xml.preferences);
 
-            Preference themePreference = findPreference(getResources().getString(R.string.settings_key_theme));
-            assert themePreference != null;
-            themePreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+            findPreference(getResources().getString(R.string.settings_key_theme)).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
             {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object o)
@@ -76,36 +71,11 @@ public class SettingsActivity extends AppCompatActivity
                         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
                     }
 
-                    FragmentActivity activity = getActivity();
-                    if (activity != null) {
-                        activity.recreate();
-                    }
+                    getActivity().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.getUnitText()
-                        );
-                dialogFragment.setTargetFragment(this, 0);
-                dialogFragment.show(getParentFragmentManager(), DIALOG_FRAGMENT_TAG);
-            }
-            else
-            {
-                super.onDisplayPreferenceDialog(preference);
-            }
-        }
     }
 }