mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-18 13:49:15 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,210 Commits 40 Branches 160 Tags
create-pull-request/patch-1744921489
Commit Graph

6210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Branden Archer
330ded0b5d Merge pull request #334 from TheLastProject/fix/sdk28 
Up targetSdk for Google Play
 2019-12-30 19:45:46 -08: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
396801ba74 Merge pull request #326 from TheLastProject/feature/multiline_notes 
Allow multiline notes
 2019-12-24 19:33:31 -08:00
Branden Archer
67163539d5 Merge branch 'master' into feature/multiline_notes 2019-12-24 19:25:59 -08:00
Branden Archer
c1be6f2a88 Merge pull request #330 from TheLastProject/fix/white_on_white_icons 
Fix white on white icons
 2019-12-20 20:56:50 -08: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
Branden Archer
8a3b623ea6 Merge pull request #324 from TheLastProject/feature/barcodeless_cards 
Allow barcodeless cards
 2019-12-15 12:01:42 -08:00
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
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
0d7d1658d6 Also add padding to edit activity 2019-12-12 19:42:17 +01:00
Sylvia van Os
7b7624a3e0 Fix white on white icons 2019-12-11 17:42:56 +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
80fb7e2cb3 Add 10dp white padding around all QR codes 2019-12-10 20:34:07 +01:00
Branden Archer
ed048e6424 Merge pull request #325 from 532910/master 
typo fix
 2019-12-09 17:32:31 -08:00
Sylvia van Os
bda8abfe3d Allow multiline notes 2019-12-09 14:44:15 +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
Branden Archer
acfb92e9fb Merge pull request #322 from TheLastProject/feature/dark_mode 
Dark mode
 2019-12-08 18:16:20 -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
fc930f40e4 Merge branch 'master' into feature/barcodeless_cards 2019-12-04 16:36:58 +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
8673405a50 Merge branch 'master' into feature/dark_mode 2019-12-04 12:45:50 +01:00