mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-18 05:36:39 -04:00
Code Issues Packages Projects Releases Wiki Activity
616 Commits 40 Branches 160 Tags
d7ef204d0a40a6805549f1e4571a1a5f375ca275
Commit Graph

80 Commits

Author SHA1 Message Date
Sylvia van Os
d7ef204d0a Merge branch 'master' into feature/pkpass 2020-02-21 15:33:12 +01:00
Branden Archer
54ee93b0cb Merge branch 'master' into feature/fullscreenBarcode 2020-01-25 23:41:11 -08:00
Sylvia van Os
3600065ef8 Robolectric crashes if activity recreates 2020-01-19 19:55:08 +01:00
Sylvia van Os
4a7e8b6eba Reset state on paused to prevent layout glitches 2020-01-19 19:07:06 +01:00
Sylvia van Os
2c12c312e3 Add unit tests 2020-01-19 17:46:50 +01:00
Sylvia van Os
3990992f68 Fix swapped import buttons 2020-01-18 13:37:47 +01:00
Sylvia van Os
915e364454 Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/pkpass 2020-01-12 22:50:29 +01:00
Sylvia van Os
aad98ba55b Fix NPE when sharing cards without header values 2020-01-09 20:16:54 +01:00
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
ce81d3afd4 Fix as reviewed and add test 2020-01-02 21:15:06 +01:00
Sylvia van Os
cc99af13e4 Fix tests 2020-01-01 19:43:23 +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
fd1b86b1cc Fix sharing loyalty card with icon 2019-12-18 13:26:12 +01:00
Sylvia van Os
1a6cad893d Load icon from Pkpass if exists 2019-12-18 12:15:32 +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
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
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
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
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
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
703db472fc Start implementing color parsing 2019-12-10 18:04:12 +01:00
Sylvia van Os
2f73d510e2 Unit test 2019-12-09 17:55:07 +01:00
Sylvia van Os
19755f4f86 Add test 2019-12-09 13:44:25 +01:00
Sylvia van Os
33b84ad4c3 Allow barcodeless cards 2019-12-04 15:59:49 +01:00
Sylvia van Os
07c74b79f3 Use README as index page, add share page with explanation 2019-12-02 13:14:15 +01:00
Sylvia van Os
e314580ac3 Cleanup 2019-12-02 12:56:42 +01:00
Sylvia van Os
2ef739fb4f Fix typo 2019-12-01 22:55:17 +01:00
Sylvia van Os
bae6f746a1 Another import test 2019-12-01 22:38:31 +01:00
Sylvia van Os
22e8d7f699 Fix linter warning 2019-12-01 20:53:37 +01:00
Sylvia van Os
3d2ad1693a Tests 2019-12-01 20:42:37 +01:00
Sylvia van Os
5a898b4c4c Address comments 2019-11-28 23:07:27 +01:00
Sylvia van Os
7a78eadabb Remove unneeded imports 2019-11-24 20:08:56 +01:00
Sylvia van Os
c936e3c9c0 Switch to SearchView 2019-11-23 20:27:37 +01:00
Sylvia van Os
e33565abdc Add filtering test 2019-11-23 15:27:31 +01:00
Sylvia van Os
f0426b98dc Cleanup 2019-11-23 14:29:10 +01:00
Sylvia van Os
e048fdff59 Fix tests 2019-11-22 20:24:50 +01: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
773d759ef5 Fix imports with missing colors 2018-02-17 22:37:10 -05:00
Branden Archer
9951999ca4 Add settings for font sizes 2018-02-17 16:05:10 -05:00
Branden Archer
a4bde722a6 Add config for text and background colors 
This adds config options for the colors used for the store text
and background when displaying the store name in the single
card view or the thumbnail for the card list.
 2018-02-17 15:50:32 -05:00
Branden Archer
3275279501 Remove unnecessary casts from findViewById 2018-01-31 22:49:31 -05:00
Branden Archer
2f6516ffb9 Display note on separate line, omit card id on card list 
The card id was of dubious value, because the main screen
is really for selecting the card. The note may have more value,
as it may specify info about the card.
 2018-01-31 22:49:31 -05:00