mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-01 14:21:57 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,942 Commits 39 Branches 158 Tags
1fb94de8090e9bd471a9b88a78b73980b6d67a45
Commit Graph

5942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
056c255aa6 Merge pull request #1634 from obfusk/patch-8 
generate_feature_graphic.sh: remove redundant "|| exit 1"
 2023-11-15 08:17:16 +01:00
FC (Fay) Stegerman
9c99b9d0ad generate_feature_graphic.sh: remove redundant "|| exit 1" 2023-11-14 22:50:08 +00:00
Sylvia van Os
d4a9197e60 Merge pull request #1633 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-11-13 18:21:22 +01:00
Eric
57d7176ac9 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (130 of 130 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
 2023-11-13 14:05:09 +01:00
Sylvia van Os
029fa9b5e8 Merge pull request #1632 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-11-12 13:22:12 +01:00
Denis Shilin
c38a89b48f Translated using Weblate (Russian) 
Currently translated at 100.0% (1 of 1 strings)

Translation: Catima/Android (Debug)
Translate-URL: https://hosted.weblate.org/projects/catima/android-debug/ru/
 2023-11-12 11:03:13 +01:00
Sylvia van Os
21958442bb Merge pull request #1631 from CatimaLoyalty/create-pull-request/patch-1699762504 
Update contributors
 2023-11-12 10:23:23 +01:00
TheLastProject
f92ae736b4 Update contributors 2023-11-12 04:15:04 +00:00
Sylvia van Os
548714f778 Merge pull request #1630 from CatimaLoyalty/create-pull-request/patch-1699698892 
Update Fastlane changelogs
 2023-11-11 11:35:16 +01:00
TheLastProject
1d61a7c0eb Update Fastlane changelogs 2023-11-11 10:34:52 +00:00
Sylvia van Os
6c5a06ce5b Update CHANGELOG 2023-11-11 11:34:37 +01:00
Sylvia van Os
1d4e47b832 Merge pull request #1588 from theimpulson/materialDatePicker 
LoyaltCardEditActivity: Migrate to materialdatepicker dialog
 2023-11-11 11:32:13 +01:00
Sylvia van Os
cd9ef1c231 Fix build 2023-11-11 11:03:00 +01:00
Sylvia van Os
a1011e0668 Support translating Catima app name in feature graphic (#1623) 
* Support translating Catima app name in feature graphic

Co-authored-by: FC (Fay) Stegerman <flx@obfusk.net>
 2023-11-11 10:44:31 +01:00
Sylvia van Os
9e7d51c36b Merge pull request #1627 from CatimaLoyalty/dependabot/gradle/com.android.application-8.1.3 
Bump com.android.application from 8.1.2 to 8.1.3
 2023-11-08 17:08:29 +01:00
Sylvia van Os
0e826a654b Merge pull request #1628 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-11-08 17:07:30 +01:00
Claus Kruse
40778dd494 Translated using Weblate (Danish) 
Currently translated at 36.1% (108 of 299 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/da/
 2023-11-08 10:34:16 +00:00
dependabot[bot]
d7b983f1ca Bump com.android.application from 8.1.2 to 8.1.3 
Bumps com.android.application from 8.1.2 to 8.1.3.

---
updated-dependencies:
- dependency-name: com.android.application
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-08 02:42:14 +00:00
Sylvia van Os
206f6385ae Merge pull request #1621 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-11-06 21:48:46 +01:00
Oğuz Ersen
18cba2d702 Translated using Weblate (Turkish) 
Currently translated at 100.0% (299 of 299 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
 2023-11-06 20:34:50 +01:00
Sylvia van Os
847850eeff Merge pull request #1619 from CatimaLoyalty/create-pull-request/patch-1699157613 
Update contributors
 2023-11-05 09:32:15 +01:00
TheLastProject
107bf5a0f5 Update contributors 2023-11-05 04:13:32 +00:00
Sylvia van Os
d3edde4a43 Merge pull request #1617 from CatimaLoyalty/dependabot/gradle/com.android.tools-desugar_jdk_libs-2.0.4 
Bump com.android.tools:desugar_jdk_libs from 2.0.3 to 2.0.4
 2023-11-04 11:24:52 +01:00
Sylvia van Os
963f42628f Merge pull request #1618 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-11-04 00:00:20 +01:00
Rohan H
7d83cf1dfd Translated using Weblate (Marathi) 
Currently translated at 40.8% (122 of 299 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/mr/
 2023-11-03 05:04:02 +00:00
ikanakova
5bb2df98cd Translated using Weblate (Czech) 
Currently translated at 100.0% (1 of 1 strings)

Translation: Catima/Android (Debug)
Translate-URL: https://hosted.weblate.org/projects/catima/android-debug/cs/
 2023-11-03 05:04:01 +00:00
dependabot[bot]
2796a15353 Bump com.android.tools:desugar_jdk_libs from 2.0.3 to 2.0.4 
Bumps [com.android.tools:desugar_jdk_libs](https://github.com/google/desugar_jdk_libs) from 2.0.3 to 2.0.4.
- [Changelog](https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/desugar_jdk_libs/commits)

---
updated-dependencies:
- dependency-name: com.android.tools:desugar_jdk_libs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-03 02:10:05 +00:00
Aayush Gupta
55595159be LoyaltyCardEditActivity: Handle configuration changes for MaterialDatePicker 
MaterialDatePicker is final and thus cannot be extended to handle loss of callback
on configuration changes. We aren't using ViewModel as well that would help us to persist
changes till lifecycle.

Fallback to how DatePicker was handling this situation with a couple of more hacks.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 2023-11-02 14:20:54 +05:30
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
4d6c08fc73 LoyaltCardEditActivity: Migrate to materialdatepicker dialog 
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
 2023-11-02 11:39:44 +05:30
Sylvia van Os
0c147830ee Merge pull request #1616 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-11-01 20:58:10 +01:00
Sylvia van Os
b5a3a4c735 Merge pull request #1615 from CatimaLoyalty/dependabot/gradle/org.robolectric-robolectric-4.11.1 
Bump org.robolectric:robolectric from 4.11 to 4.11.1
 2023-11-01 20:57:54 +01:00
gemamur
f867e8cb93 Translated using Weblate (Spanish) 
Currently translated at 47.6% (62 of 130 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/es/
 2023-11-01 13:05:06 +01:00
dependabot[bot]
524af89c96 Bump org.robolectric:robolectric from 4.11 to 4.11.1 
Bumps [org.robolectric:robolectric](https://github.com/robolectric/robolectric) from 4.11 to 4.11.1.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.11...robolectric-4.11.1)

---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-01 02:46:07 +00:00
Sylvia van Os
3df4d4783f Merge pull request #1613 from CatimaLoyalty/dependabot/gradle/org.robolectric-robolectric-4.11 
Bump org.robolectric:robolectric from 4.10.3 to 4.11
 2023-10-31 18:27:42 +01:00
Sylvia van Os
d0e7187273 Merge pull request #1614 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-10-31 17:52:22 +01:00
Brian Bentancour
7819460377 Translated using Weblate (Spanish (Argentina)) 
Currently translated at 66.2% (198 of 299 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es_AR/
 2023-10-30 06:49:13 +01:00
dependabot[bot]
4396214e7a Bump org.robolectric:robolectric from 4.10.3 to 4.11 
Bumps [org.robolectric:robolectric](https://github.com/robolectric/robolectric) from 4.10.3 to 4.11.
- [Release notes](https://github.com/robolectric/robolectric/releases)
- [Commits](https://github.com/robolectric/robolectric/compare/robolectric-4.10.3...robolectric-4.11)

---
updated-dependencies:
- dependency-name: org.robolectric:robolectric
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 02:47:44 +00:00
Sylvia van Os
697c6f3f39 Merge pull request #1611 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-10-29 10:20:22 +01:00
Sylvia van Os
0239e5a89e Merge pull request #1610 from CatimaLoyalty/create-pull-request/patch-1698552879 
Update contributors
 2023-10-29 09:53:19 +01:00
Neha Reddy
532fae7de5 Translated using Weblate (Kannada) 
Currently translated at 100.0% (1 of 1 strings)

Translation: Catima/Android (Debug)
Translate-URL: https://hosted.weblate.org/projects/catima/android-debug/kn/
 2023-10-29 05:20:08 +00:00
Neha Reddy
135c4498d8 Translated using Weblate (Kannada) 
Currently translated at 15.3% (20 of 130 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/kn/
 2023-10-29 05:20:07 +00:00
OMCM753
7f0e5d9c59 Translated using Weblate (Spanish) 
Currently translated at 100.0% (299 of 299 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
 2023-10-29 05:20:05 +00:00
TheLastProject
cf4eeafce0 Update contributors 2023-10-29 04:14:38 +00:00
Sylvia van Os
8597580d93 Merge pull request #1608 from CatimaLoyalty/create-pull-request/patch-1698425469 
Update locales
 2023-10-27 18:54:07 +02:00
TheLastProject
e3643328f0 Update locales 2023-10-27 16:51:09 +00:00
Sylvia van Os
e76c8219bb Merge pull request #1607 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2023-10-27 18:50:53 +02:00
Rohan H
650ad23e59 Translated using Weblate (Marathi) 
Currently translated at 37.1% (111 of 299 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/mr/
 2023-10-27 09:10:00 +00:00
OMCM753
abc66a0c08 Translated using Weblate (Spanish) 
Currently translated at 100.0% (1 of 1 strings)

Translation: Catima/Android (Debug)
Translate-URL: https://hosted.weblate.org/projects/catima/android-debug/es/
 2023-10-27 09:10:00 +00:00
Abhishek Tiwari
701e1ee5fa Translated using Weblate (Hindi) 
Currently translated at 28.4% (37 of 130 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/hi/
 2023-10-27 09:09:59 +00:00