mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-28 16:51:46 -05:00
Code Issues Packages Projects Releases Wiki Activity
535 Commits 38 Branches 157 Tags
8a3b623ea607cb5bc7961d166f53a5215e41c82d
Commit Graph

294 Commits

Author SHA1 Message Date
Sylvia van Os
e1f66e1917 Implement requested changes 2019-12-15 20:45:12 +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
4e1fb16359 Empty barcodeType is allowed now 2019-12-14 19:03:17 +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
19755f4f86 Add test 2019-12-09 13:44:25 +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
sergio
864b82d547 typo fix 
URI is an abbreviation, must be URI, not Uri.
 2019-12-09 12:38:10 +03: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
Sylvia van Os
4ec4baa53b Fix card title colour issues 2019-12-04 12:45:16 +01:00
Branden Archer
3754243748 Merge branch 'master' into feature/dark_mode 2019-12-02 23:30:32 -08:00
Branden Archer
8315067caf Merge branch 'master' into fix/improve_note_sizing 2019-12-02 23:19:48 -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
9b5a731d48 Start with dark mode 2019-12-02 15:05:19 +01:00
Sylvia van Os
5e0e8a6f67 Merge branch 'master' into fix/improve_note_sizing 2019-12-02 14:31:13 +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
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
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
48a1084c40 Fix typo 2019-12-01 20:46:13 +01:00
Sylvia van Os
3d2ad1693a Tests 2019-12-01 20:42: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
7a78eadabb Remove unneeded imports 2019-11-24 20:08:56 +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
30419b5896 Explain focusable change 2019-11-23 14:35:03 +01:00
Sylvia van Os
f0426b98dc Cleanup 2019-11-23 14:29:10 +01:00
Sylvia van Os
bd3d67574e Bump minSdk because of rawQuery usage 2019-11-22 21:03:55 +01:00
Sylvia van Os
52a09056e8 Remove default focus 2019-11-22 20:54:34 +01:00
Sylvia van Os
21a8dc6867 Show warning when no matches 2019-11-22 20:46:06 +01:00