mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-02 03:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,129 Commits 39 Branches 152 Tags
2d75ebe395aa2bb367673d2f536e11f810b01e13
Commit Graph

2399 Commits

Author SHA1 Message Date
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
727eb13a6f remove app_copyright_fmt when identical to untranslated original 2023-08-28 20:12:36 +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
TheLastProject
f0a6593c1a Update contributors 2023-08-27 07:13:21 +00:00
Sylvia van Os
2d4fa0fd85 Release Catima 2.25.3 2023-08-25 18:23:57 +02:00
Aya Ichrak
ac4ccf2635 Translated using Weblate (Arabic) 
Currently translated at 92.9% (277 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ar/
 2023-08-23 16:53:52 +02:00
Sylvia van Os
89762864ff Translated using Weblate (Arabic) 
Currently translated at 92.6% (276 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ar/
 2023-08-23 11:52:22 +02:00
ChaoticNeutralCzech
22b8f4b387 Translated using Weblate (Czech) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/cs/
 2023-08-23 11:52:22 +02:00
Osama ALSHBIBI
aebb0e84dc Translated using Weblate (Arabic) 
Currently translated at 92.6% (276 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ar/
 2023-08-23 11:52:21 +02:00
TheLastProject
f8960d9a1e Update contributors 2023-08-20 06:47:25 +00:00
TheLastProject
23c437580a Update contributors 2023-08-13 07:07:35 +00:00
しいたけ
2e52e7b231 Translated using Weblate (Japanese) 
Currently translated at 78.1% (233 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ja/
 2023-08-08 17:52:18 +02:00
skauVictor
a7b1864c6b Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2023-08-08 17:52:18 +02:00
TheLastProject
34698c7bdd Update contributors 2023-08-06 07:12:41 +00: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
Montazer Al-Taiee
ecd8fe6d43 Translated using Weblate (Arabic) 
Currently translated at 92.6% (276 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ar/
 2023-08-02 15:07:57 +02:00
Sylvia van Os
d86fb9475f Merge pull request #1452 from obfusk/fix-date-rotate 
LoyaltyCardEditActivity: fix state loss on rotation for dates
 2023-07-31 20:08:40 +02:00
dependabot[bot]
1e88e0c1cc Bump com.google.zxing:core from 3.5.1 to 3.5.2 
Bumps [com.google.zxing:core](https://github.com/zxing/zxing) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/zxing/zxing/releases)
- [Changelog](https://github.com/zxing/zxing/blob/master/CHANGES)
- [Commits](https://github.com/zxing/zxing/compare/zxing-3.5.1...zxing-3.5.2)

---
updated-dependencies:
- dependency-name: com.google.zxing:core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-31 02:58:42 +00: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
Sylvia van Os
a408f8d727 Release Catima 2.25.2 2023-07-27 19:14:44 +02:00
Sylvia van Os
fadba7a11c Merge pull request #1445 from obfusk/stocard-csv 
add python script & update stocard csv
 2023-07-24 20:54:41 +02:00
FC Stegerman
fd61434565 move stocard readme & script 2023-07-24 20:35:25 +02:00
FC Stegerman
5c95b750b2 rename to dump_stocard_stores.py 2023-07-24 18:24:42 +02:00
FC Stegerman
9851c0a2fa update stocard_stores.csv 2023-07-24 18:22:03 +02:00
FC Stegerman
c121f846c5 add stocard_stores.py script 2023-07-24 18:17:57 +02:00
ChengCheng
c20ba027cf Added translation using Weblate (Chinese (Literary)) 2023-07-24 11:42:49 +02:00
Danylo Lystopadov
3f4d4e38cd Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2023-07-24 11:41:46 +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
a9ced56023 Include newer Stocard export 2023-07-23 14:01:59 +02:00
Sylvia van Os
a4af171598 Small credits dialog tweak 2023-07-23 13:06:16 +02:00
TheLastProject
608c3ab863 Update contributors 2023-07-23 07:13:47 +00:00
Jiri Grönroos
ee6a6dffcf Translated using Weblate (Finnish) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fi/
 2023-07-22 17:08:30 +02:00
Tim Trek
5c4a905ac0 Translated using Weblate (German) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2023-07-22 17:08:30 +02:00
Milan Šalka
62dcc373ed Translated using Weblate (Slovak) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sk/
 2023-07-22 03:11:31 +02:00
Wiktor
e9b04adec6 Translated using Weblate (Polish) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pl/
 2023-07-22 03:11:31 +02:00
Sylvia van Os
5ff6059e86 Small main screen layout tweaks 2023-07-20 16:59:39 +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