Commit Graph

  • 454052638f Fix barcode centering Sylvia van Os 2020-01-28 17:32:57 +01:00
  • 1b060b26a5 Merge branch 'master' into master Sergio Paredes 2020-01-28 15:10:02 +01:00
  • 7970bb8a40 Merge pull request #350 from brarcher/pre-v0.27 Branden Archer 2020-01-26 22:41:14 -08:00
  • 8fa868e99b Update for v0.27 Branden Archer 2020-01-26 22:26:40 -08:00
  • 77a6cca57d Merge pull request #329 from TheLastProject/fix/dark_mode_unscannable Branden Archer 2020-01-26 22:21:43 -08:00
  • 5ab3a62e16 Merge branch 'master' into fix/dark_mode_unscannable Branden Archer 2020-01-26 22:15:18 -08:00
  • aa2ccac22b #308 Restore test check for barcode type Sergio 2020-01-27 00:52:12 +01:00
  • e1f4ed65bb #308 Add missing cast from CharSequence to String Sergio 2020-01-27 00:26:05 +01:00
  • 72c1a57953 #308 Add new constructor for BarcodeImageWriterTask without associated TextView. Make barcode format selectable Sergio 2020-01-26 01:20:46 +01:00
  • 24061dae97 #308 Hide barcode format on add loyalty card view Sergio 2020-01-06 21:40:24 +01:00
  • 649daf43df Revert "#308 Display barcode format on display loyalty card view" Sergio 2020-01-06 21:30:10 +01:00
  • fb9cf7a393 #308 Display barcode format on edit loyalty card view Sergio 2020-01-06 21:19:52 +01:00
  • 0d67680e7f #308 Display barcode format on select barcode view Sergio 2020-01-06 18:06:30 +01:00
  • b5d41b0ab2 #308 Display barcode format on display loyalty card view Sergio 2019-12-27 01:56:40 +01:00
  • 171ec1cd7e Merge pull request #348 from TheLastProject/feature/fullscreenBarcode Branden Archer 2020-01-26 09:25:27 -08:00
  • 54ee93b0cb Merge branch 'master' into feature/fullscreenBarcode Branden Archer 2020-01-25 23:41:11 -08:00
  • fd6c66a86a Improve documentation Sylvia van Os 2020-01-21 20:06:58 +01:00
  • 91044fdc87 Merge pull request #346 from TheLastProject/fix/swap_import_buttons Branden Archer 2020-01-20 22:38:08 -08:00
  • 3600065ef8 Robolectric crashes if activity recreates Sylvia van Os 2020-01-19 19:55:08 +01:00
  • 4a7e8b6eba Reset state on paused to prevent layout glitches Sylvia van Os 2020-01-19 19:07:06 +01:00
  • 2c12c312e3 Add unit tests Sylvia van Os 2020-01-19 17:46:50 +01:00
  • f8943af402 Tap barcode to align to top Sylvia van Os 2020-01-19 16:45:17 +01:00
  • 3990992f68 Fix swapped import buttons Sylvia van Os 2020-01-18 13:33:02 +01:00
  • 915e364454 Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/pkpass Sylvia van Os 2020-01-12 22:50:29 +01:00
  • d2ac0dacda Merge pull request #344 from brarcher/pre-v0.26.1 Branden Archer 2020-01-09 20:35:20 -08:00
  • 1a35150677 Update CHANGELOG for v0.26.1 Branden Archer 2020-01-09 19:35:13 -08:00
  • bf48e394e9 Update app for v0.26.1 Branden Archer 2020-01-09 19:34:50 -08:00
  • 003aba52af Merge pull request #343 from TheLastProject/fix/sharing_npe Branden Archer 2020-01-09 19:22:00 -08:00
  • aad98ba55b Fix NPE when sharing cards without header values Sylvia van Os 2020-01-09 20:16:54 +01:00
  • 67383a7f10 More tabs into header to save some space Sylvia van Os 2020-01-06 21:54:52 +01:00
  • 2b50e503da Merge pull request #339 from brarcher/pre-v0.26 Branden Archer 2020-01-05 20:14:23 -08:00
  • ab4c360c37 Update CHANGELOG for v0.26 Branden Archer 2020-01-05 20:05:45 -08:00
  • c76580d6be Update app version to 0.26 Branden Archer 2020-01-05 19:46:17 -08:00
  • dc8ac6b574 Merge pull request #338 from brarcher/update-translations Branden Archer 2020-01-05 19:45:12 -08:00
  • 0c23f25aca Update translations Branden Archer 2020-01-05 19:35:51 -08:00
  • 5b5ade0edc Merge branch 'feature/multiple-barcodes' of ssh://github.com/TheLastProject/loyalty-card-locker into feature/multiple-barcodes Sylvia van Os 2020-01-05 16:09:49 +01:00
  • efd0f4ef39 Fix tab state loss on rotation Sylvia van Os 2020-01-05 16:09:21 +01:00
  • 67ada5c027 Merge branch 'master' into feature/multiple-barcodes Sylvia van Os 2020-01-05 14:47:58 +01:00
  • 520f0da983 Sanitize long and multiline notes Sylvia van Os 2020-01-05 14:22:15 +01:00
  • 343d710b2a Swipe between different cards from store Sylvia van Os 2020-01-05 14:16:13 +01:00
  • 47b9bbd30d Merge pull request #336 from TheLastProject/fix/convert_to_barcodeless Branden Archer 2020-01-04 17:28:39 -08:00
  • 1c71dc964f Rename barcodecount to card count because barcodeless card support Sylvia van Os 2020-01-05 00:50:08 +01:00
  • 524d649523 Add new tests Sylvia van Os 2020-01-05 00:36:44 +01:00
  • e39593228d Fix tests Sylvia van Os 2020-01-05 00:12:12 +01:00
  • 27d718b461 Also add FAB to edit screen Sylvia van Os 2020-01-05 00:04:50 +01:00
  • 490281bff9 Fix note not reappearing Sylvia van Os 2020-01-05 00:00:37 +01:00
  • 5030e4c67a Also add FAB button to main activity Sylvia van Os 2020-01-04 23:52:36 +01:00
  • 29eac68e3f Group together multiple barcodes of same store Sylvia van Os 2020-01-04 23:45:28 +01:00
  • 422501da3e Make it easy to add extra barcodes Sylvia van Os 2020-01-04 23:00:23 +01:00
  • 23bd60b476 Add tab to switch between multiple barcodes of same store Sylvia van Os 2020-01-04 22:26:00 +01:00
  • da1d1d62e4 Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/pkpass Sylvia van Os 2020-01-04 20:25:52 +01:00
  • ce81d3afd4 Fix as reviewed and add test Sylvia van Os 2020-01-02 21:15:06 +01:00
  • cc99af13e4 Fix tests Sylvia van Os 2020-01-01 19:43:23 +01:00
  • ccf3d1f3d6 Fix converting loyalty card to barcodeless Sylvia van Os 2019-12-31 18:23:45 +01:00
  • 330ded0b5d Merge pull request #334 from TheLastProject/fix/sdk28 Branden Archer 2019-12-30 19:45:46 -08:00
  • 0bcb0a7ab8 Up targetSdk to 29 Sylvia van Os 2019-12-29 13:01:02 +01:00
  • 403c1fca33 Fix last error Travis reported Sylvia van Os 2019-12-28 21:25:17 +01:00
  • ca12f8f914 Fix some of the errors Travis reported Sylvia van Os 2019-12-28 21:19:00 +01:00
  • d5ba632bb3 Fix unit tests with Robolectric 4 Sylvia van Os 2019-12-28 21:07:47 +01:00
  • b9d158583b Update to AndroidX Branden Archer 2019-12-28 10:46:52 -08:00
  • 32b4178950 Fix some warnings Sylvia van Os 2019-12-27 17:40:12 +01:00
  • d9f97380d9 Fix status bar being white Sylvia van Os 2019-12-27 17:34:58 +01:00
  • 4e2fe97de5 Merge branch 'fix/sdk28' of ssh://github.com/TheLastProject/loyalty-card-locker into fix/sdk28 Sylvia van Os 2019-12-27 17:27:48 +01:00
  • 1a3dee2c26 Update support libraries Sylvia van Os 2019-12-27 17:27:40 +01:00
  • 53f3a2109b Merge branch 'master' into fix/sdk28 Sylvia van Os 2019-12-27 17:16:21 +01:00
  • c5c2f702d0 Up targetSdk for Google Play Sylvia van Os 2019-12-27 17:14:07 +01:00
  • 396801ba74 Merge pull request #326 from TheLastProject/feature/multiline_notes Branden Archer 2019-12-24 19:33:31 -08:00
  • 67163539d5 Merge branch 'master' into feature/multiline_notes Branden Archer 2019-12-24 19:25:59 -08:00
  • c1be6f2a88 Merge pull request #330 from TheLastProject/fix/white_on_white_icons Branden Archer 2019-12-20 20:56:50 -08:00
  • fd1b86b1cc Fix sharing loyalty card with icon Sylvia van Os 2019-12-18 13:26:12 +01:00
  • 3f4d0ab5df Grab highest quality icon Sylvia van Os 2019-12-18 12:18:32 +01:00
  • 1a6cad893d Load icon from Pkpass if exists Sylvia van Os 2019-12-18 12:15:32 +01:00
  • 2ef4d3f6e0 Fix findBugs performance warning Sylvia van Os 2019-12-16 17:03:33 +01:00
  • 43148cb12c Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/pkpass Sylvia van Os 2019-12-16 16:51:25 +01:00
  • 80b45973ac More zip types Sylvia van Os 2019-12-16 16:45:45 +01:00
  • ca8243de01 Always fall back to English and then untranslated Sylvia van Os 2019-12-16 16:34:39 +01:00
  • b4a532d183 Fix tests Sylvia van Os 2019-12-16 16:09:56 +01:00
  • a05f9f6ec9 Parsing fixes Sylvia van Os 2019-12-16 15:25:27 +01:00
  • c0d1b446d1 Make same text and header color at least slightly visible Sylvia van Os 2019-12-16 13:23:16 +01:00
  • d24a418beb Fix status bar icon colors Sylvia van Os 2019-12-16 11:36:19 +01:00
  • 1f348295a0 Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into fix/white_on_white_icons Sylvia van Os 2019-12-15 21:36:56 +01:00
  • 280fe76609 Use DrawableCompat tinting instead Sylvia van Os 2019-12-15 21:29:34 +01:00
  • 8a3b623ea6 Merge pull request #324 from TheLastProject/feature/barcodeless_cards Branden Archer 2019-12-15 12:01:42 -08:00
  • e1f66e1917 Implement requested changes Sylvia van Os 2019-12-15 20:45:12 +01:00
  • 79bba52d93 Load translations (TODO: tests) Sylvia van Os 2019-12-15 19:10:34 +01:00
  • 787bda1c77 Add test for empty barcode type Sylvia van Os 2019-12-15 14:28:48 +01:00
  • c83b151c08 Revert "Check for empty cardId in BarcodeSelectorActivity instead" Sylvia van Os 2019-12-15 12:54:51 +01:00
  • a642b12795 Use a const for luminance halfway point Sylvia van Os 2019-12-15 12:49:09 +01:00
  • 04dcee6097 Fix some tests Sylvia van Os 2019-12-14 21:37:48 +01:00
  • 6cd7a3f5bf Parse extras Sylvia van Os 2019-12-14 21:00:35 +01:00
  • 4e1fb16359 Empty barcodeType is allowed now Sylvia van Os 2019-12-14 19:03:17 +01:00
  • 0d7d1658d6 Also add padding to edit activity Sylvia van Os 2019-12-12 19:42:17 +01:00
  • 7b7624a3e0 Fix white on white icons Sylvia van Os 2019-12-11 17:35:31 +01:00
  • 09727038ce Don't crash if color is still not valid Sylvia van Os 2019-12-11 17:19:16 +01:00
  • 896da82b13 Use full .pkpass files for tests Sylvia van Os 2019-12-11 16:20:32 +01:00
  • ca93f89e1b Add Eurowings support Sylvia van Os 2019-12-11 15:32:45 +01:00
  • 9291563cef Fix color parsing Sylvia van Os 2019-12-11 14:29:41 +01:00
  • 488125c492 Merge branch 'master' into feature/barcodeless_cards Sylvia van Os 2019-12-11 14:25:41 +01:00
  • 3aeea02300 Test button state Sylvia van Os 2019-12-11 14:23:13 +01:00
  • 72227f19e8 Fix comments Sylvia van Os 2019-12-11 11:38:53 +01:00