mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-04 23:53:51 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,251 Commits 40 Branches 158 Tags
d2a500824a8eab167150d3582f2a5eff5579d337
Commit Graph

1279 Commits

Author SHA1 Message Date
Sylvia van Os
d2a500824a Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-12-04 14:04:01 +01:00
Sylvia van Os
6a91d59050 Fix crash on sharing card + release 2.11.2 2021-12-04 14:03:52 +01:00
Nyatsuki
6c254315af Translated using Weblate (Japanese) 
Currently translated at 99.1% (230 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ja/
 2021-12-02 10:54:31 +01:00
Sylvia van Os
a189ac22ce Prevent white on white status bar on Android 5 2021-11-29 21:29:44 +01:00
Sylvia van Os
45ec062499 Remove selection animator as it can break (fixes #630) 2021-11-29 20:23:17 +01:00
Sylvia van Os
5648061a31 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-11-29 19:29:44 +01:00
Sylvia van Os
9cd2f66b40 Naively fix blurriness of letter icons 2021-11-29 19:29:36 +01:00
109247019824
cfe5865d35 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2021-11-29 00:52:08 +01:00
Sylvia van Os
fa95ea6a62 Make spotBugs happy 2021-11-28 22:57:10 +01:00
Sylvia van Os
da594a8287 Fix getItemId mistake (fixes #623) 2021-11-28 22:47:02 +01:00
Sylvia van Os
15f5c4a67b Make cropper respect custom theme choice 2021-11-28 14:54:49 +01:00
Sylvia van Os
19f7af1e42 Use cropper card ratio (default) for icon layout 2021-11-28 14:14:45 +01:00
TheLastProject
45da445866 Update contributors 2021-11-28 05:15:51 +00:00
Joel A
3d2f119fdb Translated using Weblate (Swedish) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2021-11-26 22:53:13 +01:00
Sylvia van Os
466ac404bc Show "Not found" if card was removed 2021-11-26 20:25:41 +01:00
Sylvia van Os
b5c0be8ed5 Make lint happy 2021-11-25 19:34:11 +01:00
Sylvia van Os
f963b2fd4c Make spotBugs happy 2021-11-25 19:18:14 +01:00
Sylvia van Os
c75bef4f01 Open on single click 2021-11-23 23:25:10 +01:00
Sylvia van Os
f633fb39aa Use card icon image if available 2021-11-23 23:24:36 +01:00
Sylvia van Os
49200fff48 Fix most spotBugs issues 2021-11-23 23:23:58 +01:00
Sylvia van Os
f4bd6a3f59 Merge remote-tracking branch 'origin' into feature/power_screen_widgets 2021-11-23 20:42:16 +01:00
Katharine Chui
3ba42aad6d always use getContentResolver().open(Input/Output)Stream, opening streams diffrently from URIs seems to be redundent 
https://developer.android.com/reference/android/content/ContentResolver#openInputStream(android.net.Uri)

spotBug is also happier with those streams not getting closed within the scope of that function, for some reason unknown
 2021-11-23 18:42:21 +08:00
Katharine
63fad8bae1 ImportExportActivity ActivityResultLauncher, minor clean ups 2021-11-23 18:35:29 +08:00
Katharine
ad418bc9bd ScanActivity ActivityResultLauncher 2021-11-23 18:35:29 +08:00
Katharine
b0263d8eb5 MainActivity ActivityResultLauncher 2021-11-23 18:35:29 +08:00
SC
f812194b1a Translated using Weblate (Portuguese) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
 2021-11-21 23:53:04 +01:00
TheLastProject
4196ad8d61 Update contributors 2021-11-21 05:15:51 +00:00
IllusiveMan196
983c207019 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2021-11-20 22:51:35 +01:00
solokot
5eb56c934b Translated using Weblate (Russian) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-11-20 12:53:08 +01:00
Heimen Stoffels
f9b24d4b1b Translated using Weblate (Dutch) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-11-20 12:53:07 +01:00
Allan Nordhøy
537b2cba82 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 98.2% (228 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-11-20 12:53:07 +01:00
g
d788a274a8 Translated using Weblate (Lithuanian) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/
 2021-11-20 12:53:07 +01:00
J. Lavoie
57c383c064 Translated using Weblate (Italian) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-11-20 12:53:07 +01:00
J. Lavoie
49a8828007 Translated using Weblate (French) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-11-20 12:53:06 +01:00
J. Lavoie
d56a31160a Translated using Weblate (German) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-11-20 12:53:06 +01:00
Sylvia van Os
5e15555ad4 Fix deprecations 2021-11-19 15:07:04 +01:00
Oğuz Ersen
9a9ff77d1c Translated using Weblate (Turkish) 
Currently translated at 100.0% (232 of 232 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
 2021-11-18 16:53:13 +01:00
solokot
e525a32511 Translated using Weblate (Russian) 
Currently translated at 100.0% (230 of 230 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-11-18 16:20:39 +01:00
Sylvia van Os
de9f108534 Merge branch 'master' of github.com:TheLastProject/Catima 2021-11-18 16:20:28 +01:00
Sylvia van Os
c5f0d03a1c Add button to toggle showing details on main screen 2021-11-18 16:20:00 +01:00
Sylvia van Os
e592452d02 Use card shape for icons by default 2021-11-18 15:41:48 +01:00
solokot
3dbe4f8327 Translated using Weblate (Russian) 
Currently translated at 100.0% (230 of 230 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-11-18 09:53:07 +01:00
bors[bot]
8dc479793b Merge #597 
597: New card layout r=TheLastProject a=TheLastProject

TODO:
- [x] Fix cards sizing up to stay equal size but failing to size back down on group switch

Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2021-11-17 19:39:27 +00:00
Sylvia van Os
a2d48a236b Tweak margins 2021-11-17 20:35:47 +01:00
Sylvia van Os
1a5109e036 Fix card sizing 2021-11-17 19:56:27 +01:00
bors[bot]
ff42ead6b7 Merge #595 
595: Cleanup barcode selector r=TheLastProject a=TheLastProject

Should make #592 easier to implement.

Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2021-11-17 18:17:41 +00:00
Sylvia van Os
2f8d8e79c1 Make spotBugs happy 2021-11-17 19:13:28 +01:00
bors[bot]
4fc56068e1 Merge #593 
593: prevent bottomSheet from growing a padding getting into/leaving fullscreen r=TheLastProject a=Kethen

From android 5 to 9, going into full screen then back adds a top padding onto the coordinator layout bottom sheet

This aims to prevent that by removing the bottom sheet before entering full screen, then adding it back after leaving full screen

Co-authored-by: Katharine Chui <kwchuiaa@connect.ust.hk>
 2021-11-17 17:46:24 +00:00
Sylvia van Os
7a0253ddcd New card layout 2021-11-17 17:44:19 +01:00
Sylvia van Os
fc902db170 Cleanup barcode selector 2021-11-16 23:57:56 +01:00