mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-29 09:11:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,099 Commits 39 Branches 157 Tags
4612473e62dae056da299ff69d5532291c016fda
Commit Graph

223 Commits

Author SHA1 Message Date
amlwin
303b40e572 Convert ImportExportActivity to Kotlin 
Refactored `ImportExportActivity` and its corresponding test class from Java to Kotlin. The new implementation uses modern Kotlin idioms and syntax while preserving the original functionality.
 2025-10-06 11:34:45 +08:00
amlwin
622ea37554 Rename .java to .kt 2025-10-06 11:34:45 +08:00
jwkwshjsjsj
ea90d26a0a Minor string updates (#2638) 
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2025-09-10 20:12:43 +02:00
Sylvia van Os
1fc5a1e04a Remove Stocard importer 
Stocard no longer exists as a company and these import files are no
longer generated
 2025-09-08 19:55:10 +02:00
Sylvia van Os
67701840bb Add support for .pkpasses 2025-09-06 12:49:50 +02:00
Sylvia van Os
caeba57a42 Fix crash on pkpass with no barcodes 2025-05-12 19:34:51 +02:00
perepujal
4b77700b97 Merge pull request #2254 from perepujal/main 
Adding the ability to resize the width in the fullscreen view.
 2025-04-21 17:06:49 +02:00
Sylvia van Os
ac5d15578f Remove confusing import from app function 2025-04-06 20:54:22 +02:00
Sylvia van Os
2c77dcadb5 Support pkpass files without any extra data 
Previously, the code assumed one of "boardingPass", "coupon", "eventTicket", "generic" existed and refused to pass a pkpass file without any of them
 2025-03-17 18:37:28 +01:00
juuce79
1a892b2de3 Kotlin conversion of AboutActivity with tests also in Kotlin (#2360) 2025-03-02 13:30:10 +01:00
Sylvia van Os
e0786594bc Load images on request 
This prevents loading the front and back images when scrolling through
the loyalty card list and should allow scaling to more images/files more
easily
 2024-12-07 15:23:07 +01:00
Sylvia van Os
83fca93649 Use ViewModel to prevent hammering storage 
When you turn a LoyaltyCard into a bundle, it writes the files to
storage as it can't otherwise fit in the limited storage size. This
means that, on rotation, you write all images to storage and load them
again. Using a ViewModel prevents that storage hit due to holding it in
memory (as a ViewModel has a longer lifecycle).
 2024-12-07 15:23:07 +01:00
Sylvia van Os
1cb9ddecac Support for returning images from PkpassParser 2024-12-07 15:23:07 +01:00
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
FC (Fay) Stegerman
4ec1a947bc modify stocard ZIP files to include spanned archive marker 2024-10-22 21:36:28 +02: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
e0650bc6f9 Ignore cards without card ID in Fidme import 2022-09-07 19:33:07 +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