mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-15 03:56:38 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,082 Commits 41 Branches 159 Tags
c4df103c024b95b853ca4013b3eb46519a607b06
Commit Graph

4082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheLastProject
c4df103c02 Update Fastlane changelogs 2023-08-05 10:01:57 +00:00
Sylvia van Os
44211accc9 Update CHANGELOG 2023-08-05 12:01:41 +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
Sylvia van Os
1b2f939c5a Merge pull request #1462 from CatimaLoyalty/dependabot/gradle/com.github.spotbugs-5.1.1 
Bump com.github.spotbugs from 5.1.0 to 5.1.1
 2023-08-04 23:50:07 +02:00
FC Stegerman
29919851f5 LoyaltyCardEditActivity: fix color picker dialog crash & bug 2023-08-04 04:15:45 +02:00
dependabot[bot]
b255cd63de Bump com.github.spotbugs from 5.1.0 to 5.1.1 
Bumps com.github.spotbugs from 5.1.0 to 5.1.1.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-04 02:13:47 +00:00
Sylvia van Os
5d022ee1d1 Merge pull request #1460 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-08-02 18:23:57 +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
Eric
340046905d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (128 of 128 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
 2023-08-02 15:07:57 +02:00
Slávek Banko
aba6dc9070 Translated using Weblate (Czech) 
Currently translated at 100.0% (128 of 128 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
 2023-08-02 15:07:57 +02:00
Sylvia van Os
7e75f86aba Merge pull request #1459 from CatimaLoyalty/dependabot/gradle/com.github.spotbugs-5.1.0 
Bump com.github.spotbugs from 5.0.14 to 5.1.0
 2023-08-01 08:23:55 +02:00
Sylvia van Os
8c021141b0 Merge pull request #1458 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-08-01 08:23:19 +02:00
dependabot[bot]
1739ac827a Bump com.github.spotbugs from 5.0.14 to 5.1.0 
Bumps com.github.spotbugs from 5.0.14 to 5.1.0.

---
updated-dependencies:
- dependency-name: com.github.spotbugs
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-08-01 02:59:27 +00:00
Reza Almanda
2c8bbd3f44 Translated using Weblate (Indonesian) 
Currently translated at 95.2% (121 of 127 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/id/
 2023-08-01 03:16:37 +02:00
Slávek Banko
2afad63f31 Translated using Weblate (Czech) 
Currently translated at 100.0% (127 of 127 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
 2023-08-01 03:16:37 +02:00
Sylvia van Os
e4d2196892 Merge pull request #1457 from CatimaLoyalty/create-pull-request/patch-1690827013 
Update Fastlane changelogs
 2023-07-31 20:10:25 +02:00
TheLastProject
b26aced825 Update Fastlane changelogs 2023-07-31 18:10:12 +00:00
Sylvia van Os
a9625fc1cf Update CHANGELOG 2023-07-31 20:09:54 +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
Sylvia van Os
b6ea845236 Merge pull request #1456 from CatimaLoyalty/dependabot/gradle/com.google.zxing-core-3.5.2 
Bump com.google.zxing:core from 3.5.1 to 3.5.2
 2023-07-31 19:22:18 +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
Sylvia van Os
72b8781eec Merge pull request #1455 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-07-30 13:22:12 +02:00
Reza Almanda
dd8c63b088 Translated using Weblate (Indonesian) 
Currently translated at 95.2% (121 of 127 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/id/
 2023-07-30 13:08:02 +02:00
Eric
ec9affd8c3 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (127 of 127 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
 2023-07-30 13:08:02 +02:00
Sylvia van Os
605e9711fa Translated using Weblate (Polish) 
Currently translated at 36.2% (46 of 127 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pl/
 2023-07-30 13:08:02 +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
Sylvia van Os
b98ee46566 Merge pull request #1451 from obfusk/fix-divider 
only show divider with name/note + extra field
 2023-07-29 16:52:20 +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 v2.25.2 2023-07-27 19:14:44 +02:00
Sylvia van Os
2d7bb02d1a Update fastlane 2023-07-27 19:07:10 +02:00
Sylvia van Os
38c8e38ed6 Merge pull request #1446 from CatimaLoyalty/create-pull-request/patch-1690299279 
Update Fastlane changelogs
 2023-07-25 17:35:15 +02:00
TheLastProject
28b95b8f75 Update Fastlane changelogs 2023-07-25 15:34:39 +00:00
Sylvia van Os
c1ebbdb997 Update CHANGELOG.md 2023-07-25 17:34:22 +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
Sylvia van Os
398dff4b3c Merge pull request #1444 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-07-24 19:35:57 +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
Kamborio
e5dd26b8ee Translated using Weblate (Spanish) 
Currently translated at 29.1% (37 of 127 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/es/
 2023-07-24 11:41:46 +02:00
Danylo Lystopadov
3b449464ac Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (127 of 127 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/
 2023-07-24 11:41:46 +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
Sylvia van Os
30ccd03686 Merge pull request #1442 from obfusk/usages-len 
StocardImporter: check usages is not empty just in case
 2023-07-23 21:57:48 +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
4172903b42 Merge pull request #1441 from CatimaLoyalty/stocard_20230721 
Update Stocard importer
 2023-07-23 16:48:53 +02:00
Sylvia van Os
00b1368176 Fix image import 2023-07-23 16:29:55 +02:00