mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-20 12:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,795 Commits 43 Branches 156 Tags
8eeff0058bc7c788231dd0698a8a32496d2fdc1a
Commit Graph

208 Commits

Author SHA1 Message Date
Sylvia van Os
8eeff0058b Refactor ScanActivity result code (use ParseResult) 2024-12-07 15:23:07 +01:00
Sylvia van Os
ea456c6d80 Add Pkpass parser 2024-12-07 15:23:05 +01:00
vp193dt
6f4582eec9 Refactoring of Search Behavior: Restoring of Previous Search Query After Coming Back from Card Interaction or Screen Rotation on Search 2024-11-06 19:12:01 +01:00
Sylvia van Os
727d9ce781 Refactor to allow updating a loyalty card from a bundle (#2051) 
This allows us to send any (partial) loyalty card into the edit
activity, granting us greater flexibility in what kind of scan result we
can parse
 2024-09-22 10:20:58 +02:00
Sylvia van Os
7a2ff0995f Show image type on view screen when not viewing barcode 2024-05-20 17:47:19 +02:00
Sylvia van Os
fcb2be604c Optimize imports 2024-02-07 19:27:18 +01:00
Aayush Gupta
5cab0e3932 LoyaltyCardViewActivityTest: Update test to handle MaterialDatePicker migration 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 2023-11-02 11:39:44 +05:30
Aayush Gupta
b2494d8fdc test: Migrate to from OnBackPressed to OnBackPressedDispatcher 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 2023-10-01 19:32:16 +05:30
Sylvia van Os
3c3a37a9e8 Merge pull request #1524 from CatimaLoyalty/betterDefaultCardColours 
Better default card colours
 2023-09-26 19:30:59 +02:00
Sylvia van Os
573da1e4ff New add card workflow (#1512) 2023-09-26 19:30:35 +02:00
Sylvia van Os
1f70446bce Fix typo 
Co-authored-by: FC (Fay) Stegerman <flx@obfusk.net>
 2023-09-25 22:22:40 +02:00
Sylvia van Os
4b2d981cc6 Add test to ensure colours have white foreground 2023-09-24 15:44:22 +02:00
Sylvia van Os
715df432a9 Move archive mode into a display option (#1477) 2023-08-27 22:55:45 +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
6dfbb169df LoyaltyCardEditActivity: fix noDataLossOnResumeOrRotate test 2023-07-29 21:30:08 +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
a9ced56023 Include newer Stocard export 2023-07-23 14:01:59 +02:00
FC Stegerman
22d671263a JPGs instead of LetterBitmap (robolectric missing Canvas support) 2023-07-18 23:27:44 +02:00
FC Stegerman
9cf9959b6b add importExistingCardsAfterModification test 2023-07-16 19:53:41 +02:00
José Rebelo
c8b6328cc6 Fix parse of import URI with trailing slash 2023-07-05 13:05:47 +01:00
José Rebelo
bf94d208bd Introduce read-only ContentProvider for cards (#1121) 2023-07-03 20:59:39 +02:00
Sylvia van Os
2a6fe92b1b Support selecting exactly which details to view in main view 2023-06-04 11:06:35 +02:00
Sylvia van Os
b48de921fc Redesign of home screen and view UI (#1296) 
* Redesign of home screen and view UI

* Update screenshots and CHANGELOG

* Make spotbugs happy

* Fix double store name announcement
 2023-05-17 21:15:56 +02:00
Sylvia van Os
3b45802a7f Move all import unit test strings to their own files 
They should've been files from the start, because you import files, not
text string.
 2023-04-17 20:48:27 +02:00
Sylvia van Os
4b2b999653 Ensure unit tests use targetSdk instead of API 23 (Android 6) 2023-04-16 15:20:30 +02:00
Sylvia van Os
6653a940ed Make spotbugs happy 2023-04-10 21:36:35 +02:00
Sylvia van Os
2b2d5ca7cf Fix Stocard import 2023-03-17 23:09:00 +01:00
Alexander Ivanov
f1753ea943 Add Valid From field 
Signed-off-by: Alexander Ivanov <vanogrid@gmail.com>
 2023-02-01 19:22:20 +01:00
polarhun
ccf12bf028 #1044 - Automatic Balance Update (#1073) 2022-10-16 14:25:26 +02:00
Sylvia van Os
1a22c27326 Move Archive back into overflow menu 
While I much prefer the design introduced in
https://github.com/CatimaLoyalty/Android/pull/1009, it sadly caused a
serious performance regression
(https://github.com/CatimaLoyalty/Android/issues/1026).

This commit restores the old behaviour so that a new release isn't
blocked while this is figured out.
 2022-09-19 19:49:07 +02:00
Sylvia van Os
5bfca6e428 Always update last used when creating or editing a card 2022-09-08 19:27:31 +02:00
Sylvia van Os
3edb0f6a5d Improve welcome screen 2022-09-04 22:29:59 +02:00
Katharine Chui
ddf27e619d use black/white for cardview fab icon, change floppy icon to check mark 2022-08-05 20:56:39 +08:00
Sylvia van Os
da01730c73 View activity refactor with previous/next (#937) 
- Implement new bottom bar in card view with previous/next
- Refactor info sheet into info button in new bottom bar
- Make fav icon mutable before tinting, add prev/next transitions
- Update metadata

Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Katharine Chui <kwchuiaa@connect.ust.hk>
 2022-08-02 22:14:20 +02:00
Sylvia van Os
11bb1aa126 Remove unused imports 2022-07-24 18:42:16 +02:00
Sylvia van Os
688010cae4 Fixes to currency parsing 2022-07-24 18:14:49 +02:00
Sylvia van Os
4ad73a754e Replace rotation lock icon with barcode orientation setting (#901) 2022-06-19 00:20:56 +02:00
Sylvia van Os
d39b732b77 Fix export and shortcut bugs 2022-06-17 19:53:51 +02:00
Sylvia van Os
9d07c1a29c Cleanups 2022-06-16 23:53:46 +02:00
Jasielprogramador
548b1b1e8e Archive support 2022-06-16 22:59:11 +02:00
Sylvia van Os
05f3b77a73 Various minor fixes 2022-05-25 21:06:43 +02:00
Sylvia van Os
26bbea7377 Fix Stocard import getting stuck 2022-03-22 20:25:39 +01:00
Sylvia van Os
a5901700b4 Fix crash in edit activity on locale without region 2022-02-11 18:45:28 +01:00
Sylvia van Os
6a6a8fff2b Include basic error details on import failure 2022-02-05 16:54:40 +01:00
bors[bot]
8ce0ce82ef Merge #680 
680: Cleanup DBHelper r=TheLastProject a=TheLastProject

Should fix #661 

Supersedes #678 

While #678 does fix the issue too, the real issue was that an importer could cause such a state issue. So I've instead been seriously cleaning up. While all the tests pass, I do want to test this slightly longer before merging it into master.

Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2021-12-14 19:24:29 +00:00
Sylvia van Os
f2e820f7bb Cleanup DBHelper 2021-12-13 22:47:12 +01:00
Katharine
9862a9912f 619 adapt star color to card icon 2021-12-13 16:52:21 +08:00
Sylvia van Os
49200fff48 Fix most spotBugs issues 2021-11-23 23:23:58 +01:00
Sylvia van Os
c5f0d03a1c Add button to toggle showing details on main screen 2021-11-18 16:20:00 +01:00
Sylvia van Os
2536767437 Android Studio -> Reformat Code 2021-11-14 21:55:33 +01:00