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,882 Commits 40 Branches 159 Tags
cd2eb2e0d987e244a180649ac89d35d0f601f89d
Commit Graph

7882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
B o d o
ba6cfb0a55 Translated using Weblate (German) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2026-04-27 16:11:23 +02:00
109247019824
8a24dbfdaf 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-27 16:11:21 +02:00
Oğuz Ersen
d84e13e2ef Translated using Weblate (Turkish) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
 2026-04-27 16:11:20 +02:00
大王叫我来巡山
c4727aa3d8 Translated using Weblate (Chinese (Simplified Han script)) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/zh_Hans/
 2026-04-27 16:11:18 +02:00
josé m.
110b5d4c87 Translated using Weblate (Galician) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/gl/
 2026-04-27 16:11:17 +02:00
大王叫我来巡山
b8c834794b Translated using Weblate (Chinese (Simplified Han script)) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
 2026-04-27 16:11:16 +02:00
solokot
bcc1cc412e Translated using Weblate (Russian) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2026-04-27 16:11:16 +02:00
B o d o
ff96880cc2 Translated using Weblate (German) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
 2026-04-27 16:11:15 +02:00
Sylvain Pichon
6f4e9662db Translated using Weblate (French) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2026-04-27 16:11:14 +02:00
Gideon
5da99fc5f0 Translated using Weblate (Dutch) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2026-04-27 16:11:12 +02:00
Priit Jõerüüt
ec3fc8737a Translated using Weblate (Estonian) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/et/
 2026-04-27 16:11:11 +02:00
Vasilis K.
5fd3dcda36 Translated using Weblate (Greek) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/el/
 2026-04-27 16:11:11 +02:00
Fjuro
938aaba898 Translated using Weblate (Czech) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/cs/
 2026-04-27 16:11:10 +02:00
Giovanni Donisi
cb7e6c96b0 Translated using Weblate (Italian) 
Currently translated at 100.0% (320 of 320 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2026-04-27 16:11:09 +02:00
Sylvia van Os
49b128a20c Merge pull request #3096 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2026-04-26 16:04:06 +02:00
ᅵ
7f683eb920 Translated using Weblate (Korean) 
Currently translated at 95.2% (300 of 315 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ko/
 2026-04-26 13:10:01 +00:00
Sylvia van Os
489c89205d Merge pull request #3095 from CatimaLoyalty/fix/remove_unneeded_nfc_permission 
Remove unneeded NFC permission
 2026-04-25 18:20:55 +02:00
Sylvia van Os
4b0b91de98 Remove unneeded NFC permission 2026-04-25 16:09:39 +02:00
Sylvia van Os
c54b1ab4a0 Merge pull request #3094 from CatimaLoyalty/create-pull-request/patch-1777125791 
Update Fastlane changelogs
 2026-04-25 16:03:39 +02:00
TheLastProject
8055a2b651 Update Fastlane changelogs 2026-04-25 14:03:11 +00:00
Sylvia van Os
71ababc4d1 Update CHANGELOG 2026-04-25 16:02:58 +02:00
Sylvia van Os
498b885398 Merge pull request #3047 from il-Luca/feature/pause-nfc-while-viewing-card 
Add option to pause NFC while viewing a card
 2026-04-25 16:02:30 +02:00
Sylvia van Os
774fcfd497 Improve comment clarity 2026-04-25 15:46:23 +02:00
Sylvia van Os
0967e475d5 Pause NFC by default 2026-04-25 15:42:08 +02:00
Sylvia van Os
2bd6fc444e Show snackbar when NFC is paused 2026-04-25 14:07:14 +02:00