mirror/Android
1
0 Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-09-19 12:28:13 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,390 Commits 31 Branches 165 Tags
520629c0759f99cb5f15fa1c3b309d1db5df45d2
Commit Graph
731 Commits
Author SHA1 Message Date
Sylvia van Os 520629c075 Merge pull request #1572 from CatimaLoyalty/fix/newNavigationBarButtonColors 
Fix navigation bar button colors
 2023-10-12 10:39:12 +02:00
Sylvia van Os ef9a490d0b Make app title translatable 2023-10-11 22:57:29 +02:00
Sylvia van Os 4c26434f41 Fix navigation bar button colors 2023-10-11 21:23:54 +02:00
Sylvia van Os 207e83a582 Update donate link 2023-10-07 23:52:46 +02:00
Aayush Gupta 76b65b45bc CatimaAppCompatActivity: Set navigation bar color on Android 8.1+ 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 2023-10-05 11:19:16 +05:30
Sylvia van Os 98c595696d Merge pull request #1535 from theimpulson/1498 
Migrate to from OnBackPressed to OnBackPressedDispatcher
 2023-10-02 20:37:23 +02:00
Aayush Gupta aea1ea0cbf Migrate to from OnBackPressed to OnBackPressedDispatcher 
Closes: https://github.com/CatimaLoyalty/Android/issues/1498

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 2023-10-01 18:51:06 +05:30
Sylvia van Os d66176e628 Fix incorrect UI updates when toggling showing archive if all cards in group are in archive 
The callback used by the display options menu bypassed the card counter.
This used to work fine as the visible count used to remain the same but
when toggling the visibility of archived cards was added to the display
menu this caused the UI to get stuck with a wrong idea of how many cards
are visible.
 2023-09-27 17:52:44 +02:00
Sylvia van Os 573da1e4ff New add card workflow (#1512) 2023-09-26 19:30:35 +02:00
Sylvia van Os 97343515a3 Consistency: may not/cannot -> must not 2023-09-23 18:11:42 +02:00
Sylvia van Os dcbd2aa390 Merge pull request #1514 from CatimaLoyalty/improveValidation 
Improve validation
 2023-09-22 22:32:21 +02:00
Sylvia van Os 12e7aaa615 Trim spaces in store name 2023-09-22 22:02:15 +02:00
Sylvia van Os 50f93b87f5 Cleanups 2023-09-22 21:18:52 +02:00
Sylvia van Os b4cefbc15e Merge pull request #1517 from CatimaLoyalty/returnToLastViewAfterEdit 
Return to last view after edit
 2023-09-22 21:04:17 +02:00
FC Stegerman 5035b83ae1 ManageGroupsActivity: rm unused setGroupNameError() 2023-09-22 20:13:32 +02:00
Sylvia van Os 473f8e6b72 Fix barcode not showing when returning and changing from none to some barcode 2023-09-19 20:45:34 +02:00
Sylvia van Os 8310f09641 Hide keyboard when switching back to view view 2023-09-19 19:40:13 +02:00
Sylvia van Os 31b9123a8f Don't close view activity when entering edit activity 2023-09-19 19:39:33 +02:00
Sylvia van Os 4aa56a55fe Balance validation fixes 
Remove old string which may sometimes display "does not seem like a
valid balance." and default to 0 as balance if field is emptied.
 2023-09-17 17:59:42 +02:00
Sylvia van Os 00d08d741c Don't regenerate barcode if value is empty 2023-09-17 17:37:24 +02:00
Sylvia van Os 2f33be6b3c Improve validation 
If a field is empty when it shouldn't be, show it at the correct UI
element and focus
 2023-09-17 17:37:21 +02:00
Sylvia van Os d54a3127a6 Improve create group dialog 
Don't show error from the start, disable OK button unless state is okay
 2023-09-17 16:39:57 +02:00
FC (Fay) Stegerman 8ba860f6c3 embed history/privacy policy/license in app (#1346) 2023-08-29 21:57:49 +02:00
Quang Trung 5668fb1152 Android 13 per app language support (#1447) 2023-08-29 19:06:07 +02:00
FC Stegerman 4ebbe758e3 About: explicitly mention contributors' copyright 2023-08-28 19:28:39 +02:00
Sylvia van Os 715df432a9 Move archive mode into a display option (#1477) 2023-08-27 22:55:45 +02:00
Sylvia van Os 7be1ee99ca Merge pull request #1463 from obfusk/fix-colorpicker 
LoyaltyCardEditActivity: fix color picker dialog crash & bug
 2023-08-05 12:00:49 +02:00
FC Stegerman b83dbb3a87 StocardImporter: refactor (#1443) 
* StocardImporter: refactor

* StocardImporter: trim CSV fields

* LoyaltyCard: add .toString()

* StocardRecord: add .toString()

* StocardImporter: handle usages better

* StocardImporter: use label

* ImportExportTest: add importStocard2 + stocard2.zip

* StocardImporter: iterate over card map in key order

* StocardImporter: cleanup, handle label better, use providers file

* make spotbugs happy

* StocardImporter: can't use providersFileName, list known files, log unknown

* StocardImporter: fix regex, log properly, s/Provider/Store/

* StocardImporter: test /usages/ timestamp, nicer if/else flow

* StocardImporter: fix label usage

* StocardImporter: remove label prefix, improve error
 2023-08-05 11:52:59 +02:00
FC Stegerman 7e3a5a9831 LoyaltyCardEditActivity: fix wrong balance parse after locale changes (#1454) 2023-08-05 11:29:59 +02:00
FC Stegerman 29919851f5 LoyaltyCardEditActivity: fix color picker dialog crash & bug 2023-08-04 04:15:45 +02:00
FC Stegerman 6dfbb169df LoyaltyCardEditActivity: fix noDataLossOnResumeOrRotate test 2023-07-29 21:30:08 +02:00
FC Stegerman f671c6b0d1 LoyaltyCardEditActivity: fix state loss on rotation for dates 2023-07-29 21:14:51 +02:00
FC Stegerman 3353cf288f only show divider with name/note + extra field 2023-07-29 15:49:09 +02:00
FC Stegerman 5493947c28 StocardImporter: check usages is not empty just in case 2023-07-23 20:56:24 +02:00
Sylvia van Os 00b1368176 Fix image import 2023-07-23 16:29:55 +02:00
Sylvia van Os 09fee5628f Read usage-statistics/content.json file for lastUsed data 2023-07-23 14:28:14 +02:00
Sylvia van Os 7a7a2f8361 Read input_provider_name in field if available 2023-07-23 14:25:56 +02:00
Sylvia van Os a4af171598 Small credits dialog tweak 2023-07-23 13:06:16 +02:00
Sylvia van Os 450cfce84a Merge pull request #1434 from obfusk/refactor-importer-part-2 
refactor importer part 2
 2023-07-19 21:17:22 +02:00
Quang Trung 682fc8303c Fix crash on configuration changes in DatePickerFragment (#1431) 2023-07-19 20:52:25 +02:00
FC Stegerman aa1274566b refactor FidmeImporter 2023-07-19 01:25:00 +02:00
FC Stegerman d8cd581cb0 refactor StocardImporter 2023-07-19 01:10:39 +02:00
FC Stegerman 2cd00f9103 refactor VoucherVaultImporter 2023-07-19 00:24:09 +02:00
FC StegermanandSylvia van Os d350d0b2c7 CatimaImporter: add comment about card group import 
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2023-07-17 20:42:36 +02:00
FC StegermanandSylvia van Os ac0f6f6f3e Utils.getRenamedCardImageFileName(): add javadoc 
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2023-07-17 20:35:02 +02:00
FC StegermanandSylvia van Os ab030ba002 LocaltyCard.isDuplicate(): reformat & add comments 
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2023-07-17 20:23:52 +02:00
FC Stegerman 3ae665b70f DBHelper: add note to DEFAULT_ZOOM_LEVEL 2023-07-16 20:16:01 +02:00
FC Stegerman d11e2c166b Utils.copyToTempFile(): use try for resource management 2023-07-16 18:29:38 +02:00
FC Stegerman f783be7a4f importer: handle inputFile errors better 2023-07-16 18:16:41 +02:00
FC Stegerman 9ee96b88e8 CatimaImporter: add .close() 2023-07-16 18:04:26 +02:00