100 Commits
Author SHA1 Message Date
Branden ArcherandGitHub ccd848c0b8 Merge pull request #368 from TheLastProject/fix/367
Improve export/import dialog messages
2020-06-20 20:06:14 -07:00
Branden ArcherandGitHub 9de6a2e0da Merge pull request #363 from brarcher/pre-v0.28
Update for v0.28
2020-03-09 22:31:54 -07:00
Branden ArcherandGitHub 9f1d5ad1b3 Update CHANGELOG for v0.28 2020-03-09 22:26:19 -07:00
Branden ArcherandGitHub 290abd9c56 Update for v0.28 2020-03-09 22:22:07 -07:00
Branden ArcherandGitHub 72a04b570a Merge pull request #362 from brarcher/translations
Update translations from Transifex
2020-03-09 22:21:28 -07:00
Branden Archer 1fccfff338 Update translations from Transifex 2020-03-09 22:16:54 -07:00
Branden ArcherandGitHub d22f8cc5e9 Merge pull request #358 from brarcher/brarcher-readme
Mention hiatus in README
2020-03-08 22:32:37 -07:00
Branden ArcherandGitHub 7fc88cd5af Merge branch 'master' into brarcher-readme 2020-03-08 22:28:16 -07:00
Branden ArcherandGitHub ab485991f1 Merge pull request #361 from brarcher/brarcher-patch-1
Delete .travis.yml
2020-03-08 22:27:34 -07:00
Branden ArcherandGitHub e579168a03 Delete .travis.yml 2020-03-08 22:17:19 -07:00
Branden ArcherandGitHub 38fc515372 Merge pull request #360 from brarcher/github-action
Create android.yml
2020-03-08 22:15:55 -07:00
Branden ArcherandGitHub aad074e29e Create android.yml
This creates a GitHub Action for building and
testing the project, as an attempt to replace
Travis-CI.
2020-03-08 22:10:54 -07:00
Branden ArcherandGitHub 4321bf5ac8 Merge pull request #352 from TheLastProject/feature/choose_export_location
Choose export location
2020-03-08 22:00:51 -07:00
Branden ArcherandGitHub 288531dff0 Mention hiatus in README 2020-02-24 23:07:56 -08:00
Branden ArcherandGitHub 678f126403 Merge pull request #333 from sergiowalls/master
Display barcode format
2020-02-24 23:02:41 -08:00
Branden ArcherandGitHub 3ae496427a Merge branch 'master' into master 2020-02-24 22:51:31 -08:00
Branden ArcherandGitHub 046348612f Merge pull request #351 from TheLastProject/fix/fullscreen_leave_uncenter
Fix barcode centering when leaving fullscreen
2020-02-24 22:33:08 -08:00
Branden ArcherandGitHub 2f562b432c Merge pull request #357 from brarcher/translations
Update nb_NO translations from Weblate
2020-02-01 16:41:19 -08:00
Branden Archer b776f90b87 Update translations from Weblate 2020-02-01 16:13:14 -08:00
Branden ArcherandGitHub 7970bb8a40 Merge pull request #350 from brarcher/pre-v0.27
Update for v0.27
2020-01-26 22:41:14 -08:00
Branden Archer 8fa868e99b Update for v0.27 2020-01-26 22:26:40 -08:00
Branden ArcherandGitHub 77a6cca57d Merge pull request #329 from TheLastProject/fix/dark_mode_unscannable
Fix dark mode scanning issues
2020-01-26 22:21:43 -08:00
Branden ArcherandGitHub 5ab3a62e16 Merge branch 'master' into fix/dark_mode_unscannable 2020-01-26 22:15:18 -08:00
Branden ArcherandGitHub 171ec1cd7e Merge pull request #348 from TheLastProject/feature/fullscreenBarcode
Move barcode to top on tap
2020-01-26 09:25:27 -08:00
Branden ArcherandGitHub 54ee93b0cb Merge branch 'master' into feature/fullscreenBarcode 2020-01-25 23:41:11 -08:00
Branden ArcherandGitHub 91044fdc87 Merge pull request #346 from TheLastProject/fix/swap_import_buttons
Fix swapped import buttons
2020-01-20 22:38:08 -08:00
Branden ArcherandGitHub d2ac0dacda Merge pull request #344 from brarcher/pre-v0.26.1
Update for v0.26.1
2020-01-09 20:35:20 -08:00
Branden Archer 1a35150677 Update CHANGELOG for v0.26.1 2020-01-09 19:45:08 -08:00
Branden Archer bf48e394e9 Update app for v0.26.1 2020-01-09 19:45:08 -08:00
Branden ArcherandGitHub 003aba52af Merge pull request #343 from TheLastProject/fix/sharing_npe
Fix NPE when sharing cards without header values
2020-01-09 19:22:00 -08:00
Branden ArcherandGitHub 2b50e503da Merge pull request #339 from brarcher/pre-v0.26
Update for v0.26
2020-01-05 20:14:23 -08:00
Branden Archer ab4c360c37 Update CHANGELOG for v0.26 2020-01-05 20:06:54 -08:00
Branden Archer c76580d6be Update app version to 0.26 2020-01-05 20:06:54 -08:00
Branden ArcherandGitHub dc8ac6b574 Merge pull request #338 from brarcher/update-translations
Update translations
2020-01-05 19:45:12 -08:00
Branden Archer 0c23f25aca Update translations
These were pulled from the Transifex project:
transifex.com/na-243/loyalty-card-locker
2020-01-05 19:35:51 -08:00
Branden ArcherandGitHub 47b9bbd30d Merge pull request #336 from TheLastProject/fix/convert_to_barcodeless
Fix converting loyalty card to barcodeless
2020-01-04 17:28:39 -08:00
Branden ArcherandGitHub 330ded0b5d Merge pull request #334 from TheLastProject/fix/sdk28
Up targetSdk for Google Play
2019-12-30 19:45:46 -08:00
Branden ArcherandSylvia van Os b9d158583b Update to AndroidX
This is mostly the work of Android Studio's
   Refactor > Migrate to AndroidX...
option. That mostly worked. The two places which were manually updated
were:
  - The reference to AppBarLayout$ScrollingViewBehavior in
    loyalty_card_edit_activity.xml
  - The suggested constraintlayout version, 2.0.0-beta4 caused build
    issues that 1.1.3 avoids
2019-12-28 19:57:27 +01:00
Branden ArcherandGitHub 396801ba74 Merge pull request #326 from TheLastProject/feature/multiline_notes
Allow multiline notes
2019-12-24 19:33:31 -08:00
Branden ArcherandGitHub 67163539d5 Merge branch 'master' into feature/multiline_notes 2019-12-24 19:25:59 -08:00
Branden ArcherandGitHub c1be6f2a88 Merge pull request #330 from TheLastProject/fix/white_on_white_icons
Fix white on white icons
2019-12-20 20:56:50 -08:00
Branden ArcherandGitHub 8a3b623ea6 Merge pull request #324 from TheLastProject/feature/barcodeless_cards
Allow barcodeless cards
2019-12-15 12:01:42 -08:00
Branden ArcherandGitHub ed048e6424 Merge pull request #325 from 532910/master
typo fix
2019-12-09 17:32:31 -08:00
Branden ArcherandGitHub 77a2ed29db Merge branch 'master' into feature/barcodeless_cards 2019-12-08 20:15:47 -08:00
Branden ArcherandGitHub acfb92e9fb Merge pull request #322 from TheLastProject/feature/dark_mode
Dark mode
2019-12-08 18:16:20 -08:00
Branden ArcherandGitHub f00be863c2 Merge pull request #323 from TheLastProject/master
Fix GitHub pages
2019-12-03 17:30:18 -08:00
Branden ArcherandGitHub 3754243748 Merge branch 'master' into feature/dark_mode 2019-12-02 23:30:32 -08:00
Branden ArcherandGitHub 5ef2c4b1da Merge pull request #319 from TheLastProject/fix/improve_note_sizing
Improve note sizing
2019-12-02 23:29:57 -08:00
Branden ArcherandGitHub 8315067caf Merge branch 'master' into fix/improve_note_sizing 2019-12-02 23:19:48 -08:00
Branden ArcherandGitHub 7bbf5b469c Merge pull request #321 from TheLastProject/feature/card_sharing
Add ability to share and receive loyalty cards
2019-12-02 23:13:09 -08:00
Branden ArcherandGitHub ed4adad087 Merge pull request #320 from TheLastProject/feature/card_filter
Add loyalty card filter
2019-11-28 20:22:51 -08:00
Branden ArcherandGitHub 7cb5eba18f Merge pull request #313 from brarcher/pre-v0.25.4
Update for 0.25.4
2019-10-04 23:05:35 -07:00
Branden Archer 134d7fd824 Update for 0.25.4 2019-10-04 22:47:54 -07:00
Branden ArcherandGitHub 1615bc38bd Merge pull request #312 from brarcher/translations
Update translations
2019-10-04 22:45:19 -07:00
Branden Archer 3ecdf71331 Update translations
These were fetched from Transifex
2019-10-04 22:37:46 -07:00
Branden ArcherandGitHub 66a2cd438c Merge pull request #311 from brarcher/allow-backup
Allow backups of app data
2019-10-04 22:35:12 -07:00
Branden Archer 3fdff3c85a Allow backups of app data
Setting the allowBackup option enables the app to participate
in backup and restore infrastructure.
2019-10-04 22:27:17 -07:00
Branden ArcherandGitHub 56709d40b5 Merge pull request #297 from brarcher/pre-v0.25.3
Update for 0.25.3
2019-03-02 11:59:43 -08:00
Branden ArcherandGitHub a8c4c73611 Update CHANGELOG 2019-03-02 11:38:21 -08:00
Branden ArcherandGitHub 31dd0e1de2 Update for 0.25.3 2019-03-02 11:37:09 -08:00
Branden ArcherandGitHub f51e97fdf7 Merge pull request #296 from brarcher/translations
Update Russian translations
2019-03-02 11:36:23 -08:00
Branden Archer 1fcf7101f2 Update Russian translations 2019-03-02 10:19:10 -08:00
Branden ArcherandGitHub dbb7a4ea62 Merge pull request #292 from brarcher/readme
Update translation instructions in README
2019-01-28 19:26:50 -08:00
Branden ArcherandGitHub a2fa8edcf5 Update translation instructions in README 2019-01-28 07:08:28 -08:00
Branden ArcherandGitHub fd71eda561 Merge pull request #290 from brarcher/changelog
Update CHANGELOG
2019-01-05 16:09:09 -08:00
Branden ArcherandGitHub 058676bb0f Update CHANGELOG 2019-01-05 16:01:54 -08:00
Branden ArcherandGitHub 1fb59979f3 Merge pull request #289 from brarcher/pre-v0.25.2
Update for v0.25.2
2019-01-05 16:00:11 -08:00
Branden ArcherandGitHub 9bde7ce4da Update for v0.25.2 2019-01-05 15:40:48 -08:00
Branden ArcherandGitHub db3d93e1bc Merge pull request #288 from brarcher/translations
Update translations
2019-01-05 15:40:22 -08:00
Branden Archer 4fd7872c87 Update translations 2019-01-05 15:24:47 -08:00
Branden ArcherandGitHub fc313f0cfa Merge pull request #280 from comradekingu/patch-1
Norwegian Bokmål translation
2018-10-19 21:03:00 -07:00
Branden ArcherandGitHub 81d7250306 Merge pull request #275 from brarcher/pre-v0.25.1
Update for v0.25.1
2018-10-14 11:53:02 -07:00
Branden Archer 580025c99e Update for v0.25.1 2018-10-14 11:46:34 -07:00
Branden ArcherandGitHub d88bede310 Merge pull request #274 from brarcher/translations
Update translations
2018-10-14 11:46:06 -07:00
Branden Archer 4c9bc911ad Update translations 2018-10-14 11:39:21 -07:00
Branden ArcherandGitHub 38d6d6ccff Merge pull request #273 from brarcher/fix-manual-barcode
Fix manual barcode
2018-10-14 11:38:55 -07:00
Branden Archer 866eaea680 Correct log statement when entering barcode manually 2018-10-14 11:24:42 -07:00
Branden Archer 5619c1c003 Revert "Remove unneeded code"
The log statement here was misleading. This code is responsible for
receiving a barcode that a user typed in manually.

This reverts commit cafa09a86a.
2018-10-14 11:24:42 -07:00
Branden Archer b8311044db Update class file location for FindBugs
Gradle now places the compiled class file under a different path.
2018-10-14 11:24:42 -07:00
Branden Archer 3679b9a48a Update gradle and android plugin 2018-10-14 11:07:21 -07:00
Branden ArcherandGitHub 727f3f32fe Merge pull request #271 from brarcher/pre-v0.25
Update for v0.25
2018-10-07 15:28:12 -07:00
Branden Archer 6fa70afac5 Update for v0.25 2018-10-07 15:18:08 -07:00
Branden ArcherandGitHub c5ad261392 Merge pull request #270 from brarcher/translations
Update translations
2018-10-07 15:12:38 -07:00
Branden Archer 28018eb681 Update translations 2018-10-07 15:05:38 -07:00
Branden ArcherandGitHub 28f7b3db02 Merge pull request #269 from brarcher/orientation-setting
Add option to lock orientation state
2018-10-06 18:33:41 -04:00
Branden Archer 10e720de91 Add option to lock orientation state
This new option will control if the screen orientation
lock option is displayed or not. If set, the orientation lock
is forced and the unlock option is hidden.
2018-10-06 15:27:36 -07:00
Branden Archer 4de952ba2d Set rotation state in onCreate()
The menu creation need not change this state
2018-10-06 14:24:50 -07:00
Branden Archer c5de27abe3 Move orientation locking code to separate method 2018-10-06 14:24:05 -07:00
Branden Archer cafa09a86a Remove unneeded code
The IntentIntegrator parses out the result, so this
code is not necessary.
2018-09-18 10:53:16 -04:00
Branden ArcherandGitHub 1635737658 Merge pull request #267 from brarcher/translations
Update translations
2018-09-17 10:20:54 -04:00
Branden Archer 6ee60687b6 Update translations 2018-09-17 10:03:05 -04:00
Branden ArcherandGitHub 0afd9358e6 Merge pull request #266 from brarcher/fix-sorting
Sort card list case insensitive
2018-09-15 23:04:35 -04:00
Branden Archer cad3b492a2 Sort card list case insensitive 2018-09-15 22:50:36 -04:00
Branden ArcherandGitHub 59bde6916c Merge pull request #261 from brarcher/pre-v0.24
Update for v0.24
2018-07-31 21:55:52 -04:00
Branden ArcherandGitHub eb6364b932 Update CHANGELOG 2018-07-31 21:48:33 -04:00
Branden ArcherandGitHub ae7ac21785 Update for v0.24 2018-07-31 21:44:28 -04:00
Branden ArcherandGitHub 2dd02f42f5 Merge pull request #260 from brarcher/transifex
Add/update translations
2018-07-27 23:25:37 -04:00
Branden Archer 3b8e38001c Update translations 2018-07-27 23:18:38 -04:00
Branden Archer fbb0ab27ec Add Slovenian translations 2018-07-27 23:18:38 -04:00
Branden ArcherandGitHub ceea5182d1 Merge pull request #259 from brarcher/setting-barcode-brightness
Configure brightening screen when display a barcode
2018-07-25 22:43:21 -04:00