mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-10 18:37:57 -04:00
Code Issues Packages Projects Releases Wiki Activity
810 Commits 40 Branches 158 Tags
b209b670a5a567b3e90b002fdf3f0b2c1c164413
Commit Graph

194 Commits

Author SHA1 Message Date
Sylvia van Os
b209b670a5 Small UI cleanups 2020-12-01 18:49:59 +01:00
Sylvia van Os
bbba4b2e11 Correctly use plural string 2020-11-30 21:44:38 +01:00
Sylvia van Os
c1606fef62 Manual group ordering 2020-11-27 22:33:59 +01:00
Sylvia van Os
73bac0ae8d Make findBugs happy 2020-11-27 13:19:35 +01:00
Sylvia van Os
158e424a47 Add dialog giving the user scan/manually enter options (#111) 2020-11-27 12:58:55 +01:00
Sylvia van Os
04e52f0a8a Move About dialog into own activity 2020-11-23 02:17:18 +01:00
Sylvia van Os
84d7f4fbba Fix unit tests 2020-11-22 18:26:05 +01:00
Sylvia van Os
febd0cf463 Really fix change detection 2020-11-22 17:13:02 +01:00
Sylvia van Os
6929ba1c0d Ask for confirmation before leaving edit view after changes 2020-11-21 23:08:19 +01:00
Sylvia van Os
6d4babf944 Always show all import/export options 2020-11-20 14:56:11 +01:00
Sylvia van Os
3c797b5ec9 Remember active group tab 2020-11-17 18:30:47 +01:00
Sylvia van Os
dec85d8fa9 Release 1.2.1 2020-11-17 14:19:21 +01:00
Sylvia van Os
67b961c672 Fix crash on rendering card with no header colour 2020-11-17 13:51:44 +01:00
Sylvia van Os
ed62ad321b Add support for swiping between groups in main view 2020-11-17 00:00:09 +01:00
Sylvia van Os
6b24f56c79 Fix unit tests 2020-11-10 22:25:16 +01:00
Sylvia van Os
e601d1a659 Editable card ID and barcode type 2020-11-10 22:05:53 +01:00
Sylvia van Os
1641631bdc Get rid of headingStoreTextColorValue 2020-11-10 19:11:57 +01:00
Sylvia van Os
3c793fe54f Fix logic and unit tests 2020-11-09 22:31:35 +01:00
Sylvia van Os
a8960eb506 Initial edit UI changes 2020-11-09 21:34:29 +01:00
Sylvia van Os
d10c8668b6 Fix crash detected by Google Play Console pre-launch report 2020-11-07 11:34:35 +01:00
Sylvia van Os
1bda5410d8 Fix max db version 2020-11-06 20:17:57 +01:00
Sylvia van Os
4bbeb27714 Feature/groups (#71) 
* Basic group management

* Assign cards to groups

* Fix lint

* Fix findbugs 'dodgy code'

* Group name as unique key

* More group tests

* Import/export groups

* Implement group renaming and deleting

* Fix findBugs

* Fix chip marking in edit activity

* Group import/export tests

* Fix some state bugs

* Some last fixes

* Remove redundant if statement

* Fix findBugs

* Deduplicate code

* Cleanup

* Fix groups not showing up with new card

* Fix capture and enter button touching

* Fix dialog button look
 2020-11-06 18:12:06 +01:00
Arshbeer Singh
3a97d6b191 Fix Issue #72 2020-10-27 13:51:20 -07:00
Sylvia van Os
70251d7ea8 Fix app bypassing Android orientation confirmation 2020-10-26 18:48:57 +01:00
t351206
c9f3054682 New feature: Favorite cards (#70) 2020-10-25 18:01:26 +01:00
Sylvia van Os
45f266cc93 Cleanup 2020-10-24 14:45:14 +02:00
Sylvia van Os
344f7a9bc8 Fix unit tests 2020-10-22 20:11:26 +02:00
Sylvia van Os
efae7bda4c Modernize UI with FABs 2020-10-22 19:36:00 +02:00
Sylvia van Os
1cbf90a596 Remove intro 2020-10-22 18:35:33 +02:00
Sylvia van Os
9d4529b06b Initial rebrand 2020-10-22 18:15:07 +02:00
Sylvia van Os
d8776da8b6 Improve export/import dialog messages 2020-06-16 21:47:39 +02:00
Sylvia van Os
6ba4804d9a Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/choose_export_location 2020-03-08 18:10:54 +01:00
Branden Archer
3ae496427a Merge branch 'master' into master 2020-02-24 22:51:31 -08:00
Sylvia van Os
c94c3cb47e Choose export location 2020-01-28 21:01:33 +01:00
Sylvia van Os
454052638f Fix barcode centering 2020-01-28 17:32:57 +01:00
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
649daf43df Revert "#308 Display barcode format on display loyalty card view" 
This reverts commit c194a9dd
 2020-01-27 00:53:54 +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
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