mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-04 15:43:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,470 Commits 40 Branches 158 Tags
3cf1579bb09cd0faace2a6bb792fb33ddffdd352
Commit Graph

2470 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Katharine
c815c3908f added a comment explaining why setText is used there 2021-11-03 10:13:59 +08:00
Katharine
9e831924c6 remove Parcel in Group, remove onResume/onPause in ManageGroupActivity and clean ups 2021-11-03 10:13:59 +08:00
Katharine
cfc901855b update help text in group edit activity 2021-11-03 10:13:59 +08:00
Katharine Chui
a00a69e0c0 UI changes, group cache, code cleanup 
hash maps are cloned manually to make android studio and spotbug happy
 2021-11-03 10:13:59 +08:00
Katharine
426acc701e remove setSort which will likely not be implemented in here 2021-11-03 10:13:59 +08:00
Katharine
d6eccd11a5 UI touch ups 2021-11-03 10:13:59 +08:00
Katharine
cb8275771f remove database shortcuts 2021-11-03 10:13:59 +08:00
Katharine
9252c01aa7 Group does not need to be a Parcelable anymore 2021-11-03 10:13:59 +08:00
Katharine
b4b544e342 remove modularity 2021-11-03 10:13:59 +08:00
Katharine
f667fcbebe requested manifest changes 2021-11-03 10:13:59 +08:00
Katharine
cc402c39be fixing errors reported by spotbugs 2021-11-03 10:13:59 +08:00
Katharine
d5d921a1c8 Group management POC 2021-11-03 10:13:59 +08:00
bors[bot]
d8794811a1 Merge #565 
565: 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: Allan Nordhøy <epost@anotheragency.no>
 2021-11-02 16:17:28 +00:00
Allan Nordhøy
e56795307e Translated using Weblate (Norwegian Bokmål) 
Currently translated at 99.5% (221 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-11-02 16:35:12 +01:00
bors[bot]
6ad99d47aa Merge #561 
561: 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-10-31 06:12:36 +00:00
TheLastProject
2998a4d553 Update contributors 2021-10-31 05:15:42 +00:00
bors[bot]
63db8fa0f3 Merge #560 
560: 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: SC <lalocas@protonmail.com>
 2021-10-30 16:40:26 +00:00
SC
ee14d9e0c5 Translated using Weblate (Portuguese) 
Currently translated at 16.8% (15 of 89 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pt/
 2021-10-30 18:38:21 +02:00
SC
1455265045 Translated using Weblate (Portuguese) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
 2021-10-30 18:38:17 +02:00
bors[bot]
4f5cd87912 Merge #558 
558: 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: Eric <spice2wolf@gmail.com>
Co-authored-by: Joel A <joeax910@student.liu.se>
Co-authored-by: mondstern <mondstern@snopyta.org>
 2021-10-28 21:11:28 +00:00
mondstern
d5516c59a6 Translated using Weblate (Welsh) 
Currently translated at 16.2% (36 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/cy/
 2021-10-28 23:01:42 +02:00
mondstern
5654abe6e9 Translated using Weblate (Latvian) 
Currently translated at 56.3% (125 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lv/
 2021-10-28 23:01:42 +02:00
Joel A
b17a50f9c2 Translated using Weblate (Swedish) 
Currently translated at 99.0% (220 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2021-10-28 23:01:42 +02:00
Eric
87c9bb590b Translated using Weblate (Chinese (Simplified)) 
Currently translated at 81.5% (181 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/zh_Hans/
 2021-10-28 23:01:42 +02:00
bors[bot]
dc9360eb8a Merge #556 
556: 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: 109247019824 <stoyan@gmx.com>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: mondstern <mondstern@snopyta.org>
Co-authored-by: Reza Almanda <rezaalmanda27@gmail.com>
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2021-10-28 20:57:28 +00:00
Sylvia van Os
c8d2aa26f5 Add cy to selector 2021-10-28 22:56:59 +02:00