mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-05 20:52:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,092 Commits 39 Branches 157 Tags
ffb2fadcfc6ca3cee16500d8bbbfe5cd417ec1b0
Commit Graph

2092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
ffb2fadcfc Bump ucrop from 2.2.6 to 2.2.7 
Bumps [ucrop](https://github.com/Yalantis/uCrop) from 2.2.6 to 2.2.7.
- [Release notes](https://github.com/Yalantis/uCrop/releases)
- [Commits](https://github.com/Yalantis/uCrop/compare/2.2.6...2.2.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-08 02:26:27 +00:00
Sylvia van Os
5f534b9646 Merge pull request #573 from TheLastProject/create-pull-request/patch-1636313316 
Update Fastlane changelogs
 2021-11-07 20:46:20 +01:00
bors[bot]
e011324b9f Merge #572 
572: Translations update from Weblate r=TheLastProject a=weblate

Translations update from [Weblate](https://hosted.weblate.org/projects/catima/catima/) for Catima/Catima.



Current translation status:

![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg)


Co-authored-by: Marnick L'Eau <leaumar@mailbox.org>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
 2021-11-07 19:29:09 +00:00
TheLastProject
21df76a2b6 Update Fastlane changelogs 2021-11-07 19:28:36 +00:00
Oğuz Ersen
1af9789cf6 Translated using Weblate (Turkish) 
Currently translated at 18.8% (17 of 90 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/
 2021-11-07 20:28:20 +01:00
Marnick L'Eau
b891e05fb9 Translated using Weblate (Dutch) 
Currently translated at 10.0% (9 of 90 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/nl/
 2021-11-07 20:28:20 +01:00
Sylvia van Os
55e09b602f Update CHANGELOG 2021-11-07 20:28:09 +01:00
Sylvia van Os
af4075b9e2 Choose image as card icon (#333) 2021-11-07 20:27:28 +01:00
bors[bot]
da0a221c85 Merge #571 
571: Translations update from Weblate r=TheLastProject a=weblate

Translations update from [Weblate](https://hosted.weblate.org/projects/catima/catima/) for Catima/Catima.



Current translation status:

![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg)


Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: g <muziejusinfo@gmail.com>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Heimen Stoffels <vistausss@fastmail.com>
Co-authored-by: IllusiveMan196 <hamsterrv@gmail.com>
Co-authored-by: Marnick L'Eau <leaumar@mailbox.org>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: SC <lalocas@protonmail.com>
 2021-11-07 16:57:03 +00:00
SC
191445b822 Translated using Weblate (Portuguese) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
 2021-11-07 17:51:18 +01:00
Oğuz Ersen
d890b062a9 Translated using Weblate (Turkish) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
 2021-11-07 17:51:18 +01:00
Eric
59173443e7 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 82.8% (189 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/zh_Hans/
 2021-11-07 17:51:18 +01:00
Marnick L'Eau
5da76c9d9c Translated using Weblate (Dutch) 
Currently translated at 5.5% (5 of 90 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/nl/
 2021-11-07 17:51:17 +01:00
IllusiveMan196
f048566929 Translated using Weblate (Ukrainian) 
Currently translated at 99.5% (227 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2021-11-07 17:51:17 +01:00
Heimen Stoffels
fe0f4314db Translated using Weblate (Dutch) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-11-07 17:51:16 +01:00
Allan Nordhøy
8d39bd671c Translated using Weblate (Norwegian Bokmål) 
Currently translated at 98.2% (224 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-11-07 17:51:16 +01:00
g
9ad33a047f Translated using Weblate (Lithuanian) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/
 2021-11-07 17:51:16 +01:00
J. Lavoie
2a78335607 Translated using Weblate (Italian) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-11-07 17:51:16 +01:00
J. Lavoie
d99c72982d Translated using Weblate (French) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-11-07 17:51:15 +01:00
J. Lavoie
79ced018d5 Translated using Weblate (German) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-11-07 17:51:15 +01:00
Sylvia van Os
f80c79ffb1 Translated using Weblate (English) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/en/
 2021-11-07 17:51:15 +01:00
Sylvia van Os
11970004f0 Android Studio reformat 2021-11-07 15:38:55 +01:00
bors[bot]
a348ad62a2 Merge #570 
570: Update contributors r=TheLastProject a=github-actions[bot]

Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action

Co-authored-by: TheLastProject <TheLastProject@users.noreply.github.com>
 2021-11-07 12:01:42 +00:00
TheLastProject
22d612427f Update contributors 2021-11-07 05:15:30 +00:00
Sylvia van Os
a907b28fe8 Merge pull request #569 from TheLastProject/create-pull-request/patch-1636205659 
Update Fastlane changelogs
 2021-11-06 14:34:58 +01:00
TheLastProject
663612dce9 Update Fastlane changelogs 2021-11-06 13:34:18 +00:00
Sylvia van Os
a55da89eb2 Update CHANGELOG 2021-11-06 14:33:59 +01:00
bors[bot]
63ceb2589f Merge #559 
559: #372 image rotation and crop r=TheLastProject a=Kethen

`@waffshappen` suggested https://github.com/Yalantis/uCrop
targets #372



https://user-images.githubusercontent.com/22017945/139484703-e33a5da8-ccb5-4d6a-b70c-3325e34fcec9.mp4

 


Co-authored-by: Katharine <kwchuiaa@connect.ust.hk>
 2021-11-06 13:25:39 +00:00
Katharine
dd981d72d7 do not attempt image load if removed, typo fixes, do not cast literals, offer full image on cropper start 2021-11-06 12:47:08 +08:00
Katharine
8940a8ea77 card edit activity: revised instance saving, revised temp image handling 2021-11-05 00:01:03 +08:00
Katharine
57cfac3172 save state for cropper 2021-11-04 10:48:47 +08:00
Katharine
f475844bd0 wrapping up test case debugging 2021-11-04 10:48:47 +08:00
Katharine
4536453fdf debugging test case breakage 2021-11-04 10:48:47 +08:00
Katharine
3ee533b815 migrate to registerForActivityResult callbacks 2021-11-04 10:48:47 +08:00
Katharine
a744c19cce handle null intent from ucrop for when user just exits without finish cropping 2021-11-04 10:48:46 +08:00
Katharine
9cc66c5d67 minor touch ups from android studio suggestions 2021-11-04 10:48:46 +08:00
Katharine
3e5b018b55 fxing spotbug raised issues 2021-11-04 10:48:46 +08:00
Katharine
f6fee780ee cropper poc 2021-11-04 10:48:32 +08:00
bors[bot]
6971f23d0a Merge #567 
567: Translations update from Weblate r=TheLastProject a=weblate

Translations update from [Weblate](https://hosted.weblate.org/projects/catima/catima/) for Catima/Catima.



Current translation status:

![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg)


Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: solokot <solokot@gmail.com>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
 2021-11-03 21:34:43 +00:00
Oğuz Ersen
6d33576936 Translated using Weblate (Turkish) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
 2021-11-03 22:33:22 +01:00
solokot
b6c9b9059e Translated using Weblate (Russian) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-11-03 22:33:21 +01:00
J. Lavoie
000bd7b734 Translated using Weblate (Italian) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-11-03 22:33:21 +01:00
J. Lavoie
3dde4de775 Translated using Weblate (French) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-11-03 22:33:21 +01:00
J. Lavoie
9b867370c2 Translated using Weblate (German) 
Currently translated at 100.0% (228 of 228 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-11-03 22:33:20 +01:00
bors[bot]
c092a04390 Merge #566 
566: Update Fastlane changelogs r=TheLastProject a=github-actions[bot]

Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action

Co-authored-by: TheLastProject <TheLastProject@users.noreply.github.com>
 2021-11-03 20:40:54 +00:00
TheLastProject
50d80c1a9e Update Fastlane changelogs 2021-11-03 20:38:28 +00:00
Sylvia van Os
67e2147d33 Document awesome new group editing 2021-11-03 21:37:59 +01:00
bors[bot]
cfe2aaaad8 Merge #557 
557: Group management POC for #129 r=TheLastProject a=Kethen

Proof of concept for #129, please review and comment on desired changes
A few new strings are added so translations will be needed

meanwhile I think all added group has to be trimmed to avoid having identical groups like in the example

https://user-images.githubusercontent.com/22017945/139289359-32f42b48-a40e-4039-8f0b-72bbe43cd0de.mp4



https://user-images.githubusercontent.com/22017945/139294845-28c88e03-871f-49d1-9b45-f0648f2f7b50.mp4






Co-authored-by: Katharine <kwchuiaa@connect.ust.hk>
Co-authored-by: Katharine Chui <kwchuiaa@connect.ust.hk>
 2021-11-03 18:40:28 +00:00
Katharine
88a91de63b removed commented code, input check for group add, input check and minor revisions 2021-11-03 10:13:59 +08:00
Katharine
2cdeb1af9c use HashMap<> constructor to clone HashMap in LoyaltyCardCursorAdapter 2021-11-03 10:13:59 +08:00