mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-01 10:42:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
583 Commits 39 Branches 157 Tags
da1d1d62e4d2d5e257cb69145bd966ba5dc264bd
Commit Graph

339 Commits

Author SHA1 Message Date
Sylvia van Os
da1d1d62e4 Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/pkpass 2020-01-04 20:25:52 +01:00
Sylvia van Os
0bcb0a7ab8 Up targetSdk to 29 2019-12-29 13:01:02 +01:00
Sylvia van Os
403c1fca33 Fix last error Travis reported 2019-12-28 21:25:17 +01:00
Sylvia van Os
ca12f8f914 Fix some of the errors Travis reported 2019-12-28 21:19:00 +01:00
Sylvia van Os
d5ba632bb3 Fix unit tests with Robolectric 4 2019-12-28 21:07:47 +01:00
Branden Archer
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
Sylvia van Os
32b4178950 Fix some warnings 2019-12-27 17:40:12 +01:00
Sylvia van Os
d9f97380d9 Fix status bar being white 2019-12-27 17:34:58 +01:00
Sylvia van Os
4e2fe97de5 Merge branch 'fix/sdk28' of ssh://github.com/TheLastProject/loyalty-card-locker into fix/sdk28 2019-12-27 17:27:48 +01:00
Sylvia van Os
1a3dee2c26 Update support libraries 2019-12-27 17:27:40 +01:00
Sylvia van Os
53f3a2109b Merge branch 'master' into fix/sdk28 2019-12-27 17:16:21 +01:00
Sylvia van Os
c5c2f702d0 Up targetSdk for Google Play 2019-12-27 17:14:07 +01:00
Branden Archer
67163539d5 Merge branch 'master' into feature/multiline_notes 2019-12-24 19:25:59 -08:00
Sylvia van Os
fd1b86b1cc Fix sharing loyalty card with icon 2019-12-18 13:26:12 +01:00
Sylvia van Os
3f4d0ab5df Grab highest quality icon 2019-12-18 12:18:32 +01:00
Sylvia van Os
1a6cad893d Load icon from Pkpass if exists 2019-12-18 12:15:32 +01:00
Sylvia van Os
2ef4d3f6e0 Fix findBugs performance warning 2019-12-16 17:03:33 +01:00
Sylvia van Os
43148cb12c Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/pkpass 2019-12-16 16:51:25 +01:00
Sylvia van Os
80b45973ac More zip types 2019-12-16 16:45:45 +01:00
Sylvia van Os
ca8243de01 Always fall back to English and then untranslated 2019-12-16 16:34:39 +01:00
Sylvia van Os
b4a532d183 Fix tests 2019-12-16 16:09:56 +01:00
Sylvia van Os
a05f9f6ec9 Parsing fixes 2019-12-16 15:25:27 +01:00
Sylvia van Os
c0d1b446d1 Make same text and header color at least slightly visible 2019-12-16 13:23:16 +01:00
Sylvia van Os
d24a418beb Fix status bar icon colors 2019-12-16 11:36:23 +01:00
Sylvia van Os
1f348295a0 Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into fix/white_on_white_icons 2019-12-15 21:36:56 +01:00
Sylvia van Os
280fe76609 Use DrawableCompat tinting instead 2019-12-15 21:29:34 +01:00
Sylvia van Os
e1f66e1917 Implement requested changes 2019-12-15 20:45:12 +01:00
Sylvia van Os
79bba52d93 Load translations (TODO: tests) 2019-12-15 19:10:34 +01:00
Sylvia van Os
787bda1c77 Add test for empty barcode type 2019-12-15 14:28:48 +01:00
Sylvia van Os
c83b151c08 Revert "Check for empty cardId in BarcodeSelectorActivity instead" 
This reverts commit 62f7241bca.
 2019-12-15 12:54:51 +01:00
Sylvia van Os
a642b12795 Use a const for luminance halfway point 2019-12-15 12:50:08 +01:00
Sylvia van Os
04dcee6097 Fix some tests 2019-12-14 21:37:48 +01:00
Sylvia van Os
6cd7a3f5bf Parse extras 2019-12-14 21:00:35 +01:00
Sylvia van Os
4e1fb16359 Empty barcodeType is allowed now 2019-12-14 19:03:17 +01:00
Sylvia van Os
7b7624a3e0 Fix white on white icons 2019-12-11 17:42:56 +01:00
Sylvia van Os
09727038ce Don't crash if color is still not valid 2019-12-11 17:19:16 +01:00
Sylvia van Os
896da82b13 Use full .pkpass files for tests 2019-12-11 16:20:32 +01:00
Sylvia van Os
ca93f89e1b Add Eurowings support 2019-12-11 15:32:45 +01:00
Sylvia van Os
9291563cef Fix color parsing 2019-12-11 14:29:41 +01:00
Sylvia van Os
488125c492 Merge branch 'master' into feature/barcodeless_cards 2019-12-11 14:25:41 +01:00
Sylvia van Os
3aeea02300 Test button state 2019-12-11 14:23:13 +01:00
Sylvia van Os
72227f19e8 Fix comments 2019-12-11 11:38:53 +01:00
Sylvia van Os
62f7241bca Check for empty cardId in BarcodeSelectorActivity instead 2019-12-11 10:44:31 +01:00
Sylvia van Os
703db472fc Start implementing color parsing 2019-12-10 18:04:12 +01:00
Sylvia van Os
b043320af5 Only try to parse allowed barcode formats 2019-12-10 17:21:04 +01:00
Sylvia van Os
e1f25ed092 Don't crash on unsupported barcode 2019-12-09 19:49:04 +01:00
Sylvia van Os
05d38a0184 XZING uses uppercase typenames 2019-12-09 19:33:17 +01:00
Sylvia van Os
5a046b037e Make linter happy 2019-12-09 17:57:40 +01:00
Sylvia van Os
2f73d510e2 Unit test 2019-12-09 17:55:07 +01:00
Sylvia van Os
2c7cb4769a Parse barcodes if exists 2019-12-09 17:44:13 +01:00