mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-18 15:18:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,004 Commits 39 Branches 157 Tags
682fc8303c033bc58ebdd9358e8696bc7ac271c2
Commit Graph

4004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quang Trung
682fc8303c Fix crash on configuration changes in DatePickerFragment (#1431) 2023-07-19 20:52:25 +02:00
Sylvia van Os
ae07f94b25 Merge pull request #1433 from obfusk/test-bitmaps 
use JPGs instead of LetterBitmap b/c of partial robolectric Canvas support
 2023-07-18 23:53:15 +02:00
FC Stegerman
22d671263a JPGs instead of LetterBitmap (robolectric missing Canvas support) 2023-07-18 23:27:44 +02:00
Sylvia van Os
227f30361f Try to fix autoclose for real 2023-07-17 21:15:14 +02:00
Sylvia van Os
b964652b83 Merge pull request #1429 from CatimaLoyalty/create-pull-request/patch-1689620901 
Update Fastlane changelogs
 2023-07-17 21:09:32 +02:00
TheLastProject
f926ffa1d0 Update Fastlane changelogs 2023-07-17 19:08:21 +00:00
Sylvia van Os
d03b8b5635 Merge branch 'main' of github.com:CatimaLoyalty/Android 2023-07-17 21:08:02 +02:00
Sylvia van Os
4e5fea7a52 Update CHANGELOG 2023-07-17 21:07:54 +02:00
Sylvia van Os
95cb6c0a08 Merge pull request #1422 from obfusk/refactor-importer-part-1 
refactor importer part 1
 2023-07-17 21:06:00 +02:00
FC Stegerman
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 Stegerman
ac0f6f6f3e Utils.getRenamedCardImageFileName(): add javadoc 
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2023-07-17 20:35:02 +02:00
FC Stegerman
ab030ba002 LocaltyCard.isDuplicate(): reformat & add comments 
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2023-07-17 20:23:52 +02:00
Sylvia van Os
93103c8c6d Merge branch 'main' of github.com:CatimaLoyalty/Android v2.25.1 2023-07-17 18:36:28 +02:00
Sylvia van Os
576ec1e6de Release Catima 2.25.1 2023-07-17 18:35:50 +02:00
Sylvia van Os
b602ce5d78 Merge pull request #1426 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-07-17 18:29:08 +02:00
Cabrito
0ecd38ed1c Translated using Weblate (Portuguese) 
Currently translated at 100.0% (126 of 126 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pt/
 2023-07-17 18:03:59 +02:00
Cabrito
d48e02463c Translated using Weblate (Portuguese) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
 2023-07-17 18:03:59 +02:00
Sylvia van Os
b9d9c8d2e3 Use chevron-style up/down icons in groups layout 2023-07-16 21:34:03 +02:00
FC Stegerman
3ae665b70f DBHelper: add note to DEFAULT_ZOOM_LEVEL 2023-07-16 20:16:01 +02:00
FC Stegerman
9cf9959b6b add importExistingCardsAfterModification test 2023-07-16 19:53:41 +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
FC Stegerman
ba896fc1db DBHelper: don't use DEFAULT_ZOOM_LEVEL in migration 2023-07-16 18:02:52 +02:00
Sylvia van Os
47f1ea80b6 Merge pull request #1424 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-07-16 15:14:48 +02:00
Projjal Moitra
b5efa28e85 Translated using Weblate (Bengali (India)) 
Currently translated at 96.3% (287 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bn_IN/
 2023-07-16 15:05:41 +02:00
solokot
d456a8920d Translated using Weblate (Russian) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2023-07-16 15:05:41 +02:00
Sylvia van Os
4ef0c96b29 Merge pull request #1423 from CatimaLoyalty/create-pull-request/patch-1689492043 
Update contributors
 2023-07-16 10:03:08 +02:00
TheLastProject
343c77f9e3 Update contributors 2023-07-16 07:20:43 +00:00
FC Stegerman
1425d4af58 CatimaImporter: add saveAndDeduplicate() & refactor 2023-07-16 05:08:44 +02:00
FC Stegerman
48510494eb Utils: split off CARD_IMAGE_FILENAME_REGEX 2023-07-16 05:05:44 +02:00
FC Stegerman
d5d53b241a Utils: add getRenamedCardImageFileName() 2023-07-16 04:44:24 +02:00
FC Stegerman
901c2d8154 LoyaltyCard: fix isDuplicate() 2023-07-16 04:43:27 +02:00
FC Stegerman
84d7e15b5c LoyaltyCard: add isDuplicate(); Utils: add equals() 2023-07-16 03:29:31 +02:00
FC Stegerman
b8fa4d7060 DBHelper: add DEFAULT_ZOOM_LEVEL 2023-07-16 03:12:29 +02:00
FC Stegerman
da9e3bb6b2 CatimaImporter: read ZIP twice, get checksums 2023-07-16 02:23:54 +02:00
FC Stegerman
3a5973a04d Utils: add checksum() 2023-07-16 02:13:34 +02:00
Sylvia van Os
673e64924b Add security policy 2023-07-16 01:25:53 +02:00
FC Stegerman
5f99f2b17e Utils: add imageFiles() 2023-07-16 00:57:00 +02:00
FC Stegerman
bf05103955 import: copy ZIP, use File instead of InputStream 2023-07-16 00:45:18 +02:00
Sylvia van Os
5ea6155c39 Merge pull request #1421 from obfusk/patch-5 
revert s/Frie/Gratis/ in nb-rNO translation
 2023-07-14 20:07:25 +02:00
FC Stegerman
abb1cd29f0 revert s/Frie/Gratis/ in nb-rNO translation 2023-07-14 17:31:56 +00:00
Sylvia van Os
52363cdff4 Merge pull request #1420 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-07-14 17:52:25 +02:00
Bottan Hermawan
ac4f4e3a9a Translated using Weblate (Indonesian) 
Currently translated at 95.2% (120 of 126 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/id/
 2023-07-14 16:53:20 +02:00
Bottan Hermawan
555387e20d Translated using Weblate (Indonesian) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/id/
 2023-07-14 16:53:20 +02:00
Sylvia van Os
70ae8ff167 Merge pull request #1419 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-07-13 19:03:47 +02:00
Balázs Meskó
86512532f1 Translated using Weblate (Hungarian) 
Currently translated at 30.9% (39 of 126 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/hu/
 2023-07-13 14:45:59 +02:00
Eric
ebf6318aa2 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (126 of 126 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
 2023-07-13 14:45:59 +02:00
Slávek Banko
fd482a4cba Translated using Weblate (Czech) 
Currently translated at 100.0% (126 of 126 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
 2023-07-13 14:45:59 +02:00
Erik Spjelkavik
54d91dc8a1 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 99.3% (296 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2023-07-13 14:45:59 +02:00