mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-25 15:28:21 -05:00
Code Issues Packages Projects Releases Wiki Activity
582 Commits 38 Branches 157 Tags
0d67680e7f00502f1a34151d59aecb01d04d5353
Commit Graph

154 Commits

Author SHA1 Message Date
Sergio
0d67680e7f #308 Display barcode format on select barcode view 2020-01-27 00:53:54 +01:00
Sergio
b5d41b0ab2 #308 Display barcode format on display loyalty card view 2020-01-27 00:53:54 +01:00
Branden Archer
54ee93b0cb Merge branch 'master' into feature/fullscreenBarcode 2020-01-25 23:41:11 -08:00
Sylvia van Os
fd6c66a86a Improve documentation 2020-01-21 20:12:15 +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
f8943af402 Tap barcode to align to top 2020-01-19 16:45:17 +01:00
Sylvia van Os
3990992f68 Fix swapped import buttons 2020-01-18 13:37:47 +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
ce81d3afd4 Fix as reviewed and add test 2020-01-02 21:15:06 +01:00
Sylvia van Os
ccf3d1f3d6 Fix converting loyalty card to barcodeless 
The LoyaltyCardEditActivity assumes on many places that an empty string
means it doesn't know a value yet. This patch ensures that the
BarcodeSelectorActivity returns a special string so that the
LoyaltyCardEditActivity can distinguish explicitly picking no barcode
from a not yet populated field.
 2019-12-31 18:23:45 +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
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
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
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
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
62f7241bca Check for empty cardId in BarcodeSelectorActivity instead 2019-12-11 10:44:31 +01:00
Sylvia van Os
9a2d195cb2 Don't generate a barcode if id is empty 
This prevents a bug with an empty PDF 417 barcode being generated
 2019-12-09 13:20:42 +01:00
Sylvia van Os
429309deef UI improvements 2019-12-09 13:10:37 +01:00
Branden Archer
77a2ed29db Merge branch 'master' into feature/barcodeless_cards 2019-12-08 20:15:47 -08:00
Sylvia van Os
61c2c0c84a Completely removed rectangle cleanup code, 1D codes seem to need this padding 2019-12-08 18:15:08 +01:00
Sylvia van Os
08afc16d01 Don't remove paddings smaller than 20 pixels 2019-12-08 18:05:09 +01:00
Sylvia van Os
91a4461863 Fix code style 2019-12-05 19:49:45 +01:00
Sylvia van Os
e37288b842 Remove useless null check 2019-12-04 23:10:02 +01:00
Sylvia van Os
33b84ad4c3 Allow barcodeless cards 2019-12-04 15:59:49 +01:00
Sylvia van Os
368a2a30f6 Fix white border in dark theme 2019-12-04 13:27:53 +01:00
Sylvia van Os
5774064da7 Don't draw more than the actual barcode 2019-12-04 13:04:42 +01:00
Branden Archer
3754243748 Merge branch 'master' into feature/dark_mode 2019-12-02 23:30:32 -08:00
Sylvia van Os
0de50e72a6 Fixes, start with right theme 2019-12-02 18:03:36 +01:00
Sylvia van Os
4240fd55ba Style about dialog for dark mode 2019-12-02 17:09:49 +01:00
Sylvia van Os
29e8896059 Remove another unneeded import 2019-12-02 16:33:49 +01:00
Sylvia van Os
a46200f794 Merge branch 'master' into feature/dark_mode 2019-12-02 16:32:58 +01:00
Sylvia van Os
061b1db245 Cleanup 2019-12-02 16:28:16 +01:00
Sylvia van Os
8d3d9a21f7 Allow switching theme 2019-12-02 16:24:24 +01:00
Sylvia van Os
5e836758e5 Fix function calls 2019-12-02 12:57:44 +01:00
Sylvia van Os
e314580ac3 Cleanup 2019-12-02 12:56:42 +01:00
Sylvia van Os
22e8d7f699 Fix linter warning 2019-12-01 20:53:37 +01:00
Sylvia van Os
28b3aa2018 Add ability to share and receive loyalty cards 2019-12-01 18:22:55 +01:00
Sylvia van Os
5a898b4c4c Address comments 2019-11-28 23:07:27 +01:00
Sylvia van Os
d7556b9951 Remove unneeded imports 2019-11-24 19:05:26 +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