mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-10 00:53:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,907 Commits 40 Branches 159 Tags
74b15ce766096ce491eade389130b1b06d5bd272
Commit Graph

7907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
74b15ce766 Java fixes 
Use 25 in build.sh (Fedora 44 doesn't ship with 21 anymore) and target
21 consistently (Android Studio doesn't support 25 yet)
 2026-05-06 19:01:35 +02:00
Sylvia van Os
cea4a5431e Merge pull request #3115 from CatimaLoyalty/dependabot/gradle/gradle-wrapper-9.5.0 
Bump gradle-wrapper from 9.4.1 to 9.5.0
 2026-05-06 17:05:31 +02:00
dependabot[bot]
12e0105b5a Bump gradle-wrapper from 9.4.1 to 9.5.0 
Bumps [gradle-wrapper](https://github.com/gradle/gradle) from 9.4.1 to 9.5.0.
- [Release notes](https://github.com/gradle/gradle/releases)
- [Commits](https://github.com/gradle/gradle/compare/v9.4.1...v9.5.0)

---
updated-dependencies:
- dependency-name: gradle-wrapper
  dependency-version: 9.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-05-06 02:53:39 +00:00
Sylvia van Os
17be43d0d2 Merge pull request #3114 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-05-05 20:47:27 +02:00
Francisco Serrador
dd071c912a Translated using Weblate (Spanish) 
Currently translated at 94.4% (154 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/es/
 2026-05-05 18:47:00 +02:00
The Wizard
32cdacb4be Translated using Weblate (Arabic) 
Currently translated at 99.3% (318 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ar/
 2026-05-05 18:46:59 +02:00
Thu Trang Pham
c1cbebd782 Translated using Weblate (Vietnamese) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/vi/
 2026-05-05 18:46:58 +02:00
Sylvia van Os
2a334445dc Merge pull request #3113 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-05-05 13:27:21 +02:00
Patrik
34bba5a636 Translated using Weblate (Czech) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
 2026-05-05 11:12:23 +00:00
Francisco Serrador
3c18ac0d96 Translated using Weblate (Spanish) 
Currently translated at 75.4% (123 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/es/
 2026-05-05 11:12:22 +00:00
Patrik
9b9005087e Translated using Weblate (Slovak) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/sk/
 2026-05-05 11:12:21 +00:00
The Wizard
88f0bc4c28 Translated using Weblate (Arabic) 
Currently translated at 99.0% (317 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ar/
 2026-05-05 11:12:20 +00:00
Sylvia van Os
c8d368e86f Merge pull request #3112 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-05-04 11:37:04 +02:00
Patrik
318d6956fa Translated using Weblate (Slovak) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sk/
 2026-05-04 09:10:36 +00:00
Omikorin
5443214033 Translated using Weblate (Polish) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pl/
 2026-05-04 09:10:36 +00:00
NooB9496
2bdabbcd4c Translated using Weblate (Polish) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pl/
 2026-05-04 09:10:35 +00:00
Francisco Serrador
38eaa59518 Translated using Weblate (Spanish) 
Currently translated at 69.9% (114 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/es/
 2026-05-04 09:10:34 +00:00
Patrik
ed6fa92f51 Translated using Weblate (Slovak) 
Currently translated at 95.7% (156 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/sk/
 2026-05-04 09:10:33 +00:00
Sylvia van Os
7f0b4bccb3 Merge pull request #3111 from CatimaLoyalty/create-pull-request/patch-1777789590 
Update contributors
 2026-05-03 08:48:31 +02:00
TheLastProject
f4edfb870b Update contributors 2026-05-03 06:26:30 +00:00
Sylvia van Os
9a07256a70 Merge pull request #3110 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-05-02 20:34:58 +02:00
이정희
b744754949 Translated using Weblate (Korean) 
Currently translated at 94.3% (302 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ko/
 2026-05-02 18:10:09 +00:00
ssantos
f08859b377 Translated using Weblate (Portuguese) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
 2026-05-02 18:10:08 +00:00
ssantos
fb5475b724 Translated using Weblate (Portuguese (Portugal)) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt_PT/
 2026-05-02 18:10:07 +00:00
Sylvia van Os
798d26ddae Merge pull request #3109 from CatimaLoyalty/fix/nfc_state 
Ensure correct NFC state on onResume
 2026-05-02 19:02:56 +02:00
Sylvia van Os
cd2eb2e0d9 Ensure correct NFC state on onResume 
This fixes going to settings from the view activity and disabling NFC,
followed by a press of the back button from not disabling reader mode
 2026-05-02 16:14:50 +02:00
NightShiftNexus
dfa1c29fa0 feat: split complex loyaltyCardViewActivity (#3072) 2026-05-02 16:10:03 +02:00
Sylvia van Os
090e85ea1c Merge pull request #3106 from CatimaLoyalty/dependabot/gradle/androidx.compose-compose-bom-2026.04.01 
Bump androidx.compose:compose-bom from 2026.03.01 to 2026.04.01
 2026-04-30 11:44:47 +02:00
dependabot[bot]
d1fd7c1eb0 Bump androidx.compose:compose-bom from 2026.03.01 to 2026.04.01 
Bumps androidx.compose:compose-bom from 2026.03.01 to 2026.04.01.

---
updated-dependencies:
- dependency-name: androidx.compose:compose-bom
  dependency-version: 2026.04.01
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-04-30 05:37:45 +00:00
Sylvia van Os
775cba5667 Merge pull request #3105 from CatimaLoyalty/dependabot/gradle/kotlin-2.3.21 
Bump kotlin from 2.3.20 to 2.3.21
 2026-04-30 07:36:40 +02:00
dependabot[bot]
6f40bc5b1b Bump kotlin from 2.3.20 to 2.3.21 
Bumps `kotlin` from 2.3.20 to 2.3.21.

Updates `org.jetbrains.kotlin.android` from 2.3.20 to 2.3.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.20...v2.3.21)

Updates `org.jetbrains.kotlin.plugin.compose` from 2.3.20 to 2.3.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v2.3.20...v2.3.21)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin.android
  dependency-version: 2.3.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin.plugin.compose
  dependency-version: 2.3.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-04-30 02:56:01 +00:00
Sylvia van Os
e14fb974b4 Fix last updated year 2026-04-29 21:36:39 +02:00
Sylvia van Os
dbf29c6b83 Add NFC permission to privacy policy (#3104) 2026-04-29 21:24:06 +02:00
Sylvia van Os
ad44fd3382 Merge pull request #3103 from CatimaLoyalty/revert-3095-fix/remove_unneeded_nfc_permission 
Revert "Remove unneeded NFC permission"
 2026-04-29 19:42:47 +02:00
Sylvia van Os
61df41d5fe Merge pull request #3102 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-04-29 19:27:38 +02:00
Sylvia van Os
942a795c2c Revert "Remove unneeded NFC permission" 2026-04-29 19:18:52 +02:00
Sylvia van Os
5f948badd1 Translated using Weblate (Spanish) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
 2026-04-29 17:10:21 +00:00
Liner Seven
f07f32b169 Translated using Weblate (Japanese) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ja/
 2026-04-29 17:10:20 +00:00
Liner Seven
905257d039 Translated using Weblate (Japanese) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ja/
 2026-04-29 17:10:19 +00:00
ezn24
4af7500e42 Translated using Weblate (Chinese (Traditional Han script)) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/zh_Hant/
 2026-04-29 17:10:18 +00:00
Sylvia van Os
a9a3a0037b Merge pull request #3100 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-04-28 18:28:16 +02:00
Sylvia van Os
111d16319b Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2026-04-28 17:10:27 +02:00
Francisco Serrador
269a74da52 Translated using Weblate (Spanish) 
Currently translated at 67.4% (110 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/es/
 2026-04-28 17:10:26 +02:00
Milo Ivir
51a094a502 Translated using Weblate (Croatian) 
Currently translated at 2.4% (4 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/hr/
 2026-04-28 17:10:25 +02:00
Francisco Serrador
b048c017bf Translated using Weblate (Spanish) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
 2026-04-28 17:10:24 +02:00
NooB9496
d725756498 Translated using Weblate (Polish) 
Currently translated at 99.3% (162 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pl/
 2026-04-28 17:10:23 +02:00
Milo Ivir
65649bbb72 Translated using Weblate (Croatian) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/hr/
 2026-04-28 17:10:22 +02:00
Sylvia van Os
7e246e9d78 Merge pull request #3098 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-04-27 16:35:37 +02:00
Sylvain Pichon
cdf965f4da Translated using Weblate (French) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/fr/
 2026-04-27 16:11:24 +02:00
Fjuro
b2e19bb89a Translated using Weblate (Czech) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
 2026-04-27 16:11:24 +02:00