Commit Graph

22 Commits

Author SHA1 Message Date
Sergio
e1f4ed65bb #308 Add missing cast from CharSequence to String 2020-01-27 00:53:55 +01:00
Sergio
72c1a57953 #308 Add new constructor for BarcodeImageWriterTask without associated TextView. Make barcode format selectable 2020-01-27 00:53:55 +01:00
Sergio
24061dae97 #308 Hide barcode format on add loyalty card view 2020-01-27 00:53:55 +01:00
Sergio
fb9cf7a393 #308 Display barcode format on edit loyalty card view 2020-01-27 00:53:54 +01:00
Sergio
0d67680e7f #308 Display barcode format on select barcode view 2020-01-27 00:53: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
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
33b84ad4c3 Allow barcodeless cards 2019-12-04 15:59:49 +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
Branden Archer
866eaea680 Correct log statement when entering barcode manually 2018-10-14 11:24:42 -07:00
Branden Archer
5619c1c003 Revert "Remove unneeded code"
The log statement here was misleading. This code is responsible for
receiving a barcode that a user typed in manually.

This reverts commit cafa09a86a.
2018-10-14 11:24:42 -07:00
Branden Archer
cafa09a86a Remove unneeded code
The IntentIntegrator parses out the result, so this
code is not necessary.
2018-09-18 10:53:16 -04:00
Branden Archer
0e2d725591 Disable beep upon successful barcode scan 2018-02-28 22:53:05 -05:00
Branden Archer
cbc51cfb73 Remove debug toast 2018-02-17 22:37: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
ff5e5d5833 Remove unused code handling adding a card
This case is handled in another acitivity now.
2018-02-12 15:13:23 -05:00
Branden Archer
685eaec8b5 Remove views which are no longer used 2018-02-12 15:13:23 -05:00
Branden Archer
3275279501 Remove unnecessary casts from findViewById 2018-01-31 22:49:31 -05:00
Branden Archer
6ed96393d5 Change layout of single card view
This changes the layout when viewing a single card. The new layout
will have a colored area at the top which displays the first letter
of the company, and after that the barcode. The note will be displayed
on the card list screen and is presently omitted here.

As this layout is experimental, the layout for editing a card is
not yet updated. To achieve this the card viewing activity is split
into two separate classes, where one handles viewing and one handles
editing. When the view layout finalizes the edit icon can be updated
as time allows.
2018-01-31 22:49:31 -05:00