mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-19 12:28:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,713 Commits 43 Branches 156 Tags
v2.16.3
Commit Graph

1511 Commits

Author SHA1 Message Date
Sylvia van Os
1872bea0c3 Stocard: Ignore cards with missing card data 
Stocard appears to keep images for deleted cards, which causes some
cards to have only images and no data, making them impossible to import.

This is most likely a bug on Stocard's side. As a workaround, we ignore
cards with no data file.
 2022-04-14 22:25:46 +02:00
Sylvia van Os
25c35acd6d Import Stocard GS1_128 as CODE_128 
GS1_128 seems to be an implementation of CODE_128. ZXING doesn't
explicitly support GS1_128, but CODE_128 should work probably.
 2022-04-14 20:30:35 +02:00
Sylvia van Os
35747b7d9f Fix import getting stuck on unexpected exception 2022-04-14 20:20:36 +02:00
TheLastProject
e0c28830ab Update contributors 2022-04-10 05:06:31 +00:00
bors[bot]
e714d98ae6 Merge #860 
860: Translations update from Hosted Weblate r=TheLastProject a=weblate

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


It also includes following components:

* [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/)



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: Quentin PAGÈS <quentinantonin@free.fr>
 2022-04-08 20:03:02 +00:00
Quentin PAGÈS
efda8f9f10 Translated using Weblate (Occitan) 
Currently translated at 39.5% (96 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/oc/
 2022-04-04 09:10:40 +02:00
TheLastProject
92f79e9d3e Update contributors 2022-04-03 05:16:56 +00:00
Sylvia van Os
71cd16caac Fix broken colours in Fidme import 2022-03-30 19:45:10 +02:00
Sylvia van Os
34639f2a2e Don't render text sequences as single character 2022-03-29 22:19:12 +02:00
TheLastProject
e9eaf51e40 Update contributors 2022-03-27 05:07:00 +00:00
Sylvia van Os
6ed6e683b5 Translated using Weblate (Slovak) 
Currently translated at 82.7% (201 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sk/
 2022-03-25 15:09:44 +01:00
Sylvia van Os
1612bed309 Translated using Weblate (French) 
Currently translated at 100.0% (243 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2022-03-25 15:09:43 +01:00
Sylvia van Os
ac8a2c445c Translated using Weblate (Spanish) 
Currently translated at 69.1% (168 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
 2022-03-25 15:09:43 +01:00
Sylvia van Os
b5e6d40857 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2022-03-23 19:14:19 +01:00
Sylvia van Os
efef397870 Fix gray block appearing on invalid value for barcode 2022-03-23 19:13:54 +01:00
Sylvia van Os
27443db945 Import fix 2022-03-23 17:31:11 +01:00
Sylvia van Os
420886bc3f Make SpotBugs happy 2022-03-22 21:59:35 +01:00
Sylvia van Os
86a01d36db Fix background color generation 2022-03-22 21:46:37 +01:00
Sylvia van Os
329293fa7c Support custom providers in Stocard import 2022-03-22 21:26:36 +01:00
Sylvia van Os
26bbea7377 Fix Stocard import getting stuck 2022-03-22 20:25:39 +01:00
TheLastProject
43c45c9c0c Update contributors 2022-03-20 05:16:57 +00:00
TheLastProject
63dfe27b25 Update contributors 2022-03-13 05:16:54 +00:00
Sylvia van Os
affa434679 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (243 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2022-03-12 09:54:35 +01:00
109247019824
e1b604c1d2 Translated using Weblate (Bulgarian) 
Currently translated at 99.5% (242 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2022-03-11 07:55:45 +01:00
Jane Kong
45d9353b54 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 96.7% (235 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/zh_Hans/
 2022-03-11 07:55:45 +01:00
Sylvia van Os
ceceda560a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (243 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2022-03-11 07:55:45 +01:00
109247019824
088c25dbad Translated using Weblate (Bulgarian) 
Currently translated at 99.5% (242 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2022-03-11 07:55:45 +01:00
Sylvia van Os
1ce4216584 Fix extreme padding on some barcode types 2022-03-09 19:07:19 +01:00
Sylvia van Os
df29abbebd Fix weird UI glitch 
No, I don't understand why this works. Black magic, I guess.
 2022-03-08 21:10:28 +01:00
Sylvia van Os
61578a6016 Consistency improvements 2022-03-08 19:56:42 +01:00
Sylvia van Os
13695b5c37 Padding improvements 2022-03-07 22:57:42 +01:00
TheLastProject
5efea8c1e8 Update contributors 2022-03-06 05:16:09 +00:00
Joel A
6c70e77a75 Translated using Weblate (Swedish) 
Currently translated at 100.0% (243 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2022-03-04 04:58:38 +01:00
Giovanni Donisi
c821040c25 Translated using Weblate (Italian) 
Currently translated at 100.0% (243 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2022-02-27 15:54:58 +01:00
TheLastProject
b1ea2c4687 Update contributors 2022-02-27 04:46:09 +00:00
huuhaa
ebd3b0f7f5 Translated using Weblate (Finnish) 
Currently translated at 100.0% (243 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fi/
 2022-02-22 14:55:20 +01:00
IllusiveMan196
1507694bae Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (243 of 243 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2022-02-22 14:55:20 +01:00
Sylvia van Os
6d134009be Merge pull request #819 from Kethen/emoji_icon 
emoji icons, color theme in short-cut selection menu
 2022-02-20 18:11:31 +01:00
Sylvia van Os
c1d2a30931 Merge pull request #821 from Kethen/edit_view_card_icon_corner 
proper clipping for card icon inside edit view
 2022-02-20 18:05:57 +01:00
Joel A
2188280ada Translated using Weblate (Swedish) 
Currently translated at 99.5% (240 of 241 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2022-02-20 16:58:40 +01:00
Katharine Chui
fdc8cb0adf proper clipping for card icon inside edit view 2022-02-20 20:33:25 +08:00
Katharine Chui
d9f0ea8346 emoji icons, color theme in short-cut selection menu 2022-02-20 19:16:43 +08:00
TheLastProject
a262120bc3 Update contributors 2022-02-20 05:16:06 +00:00
Sylvia van Os
446131a87d Merge pull request #817 from Kethen/card_view_color_fix 
#803 cardView appbar icon fix
 2022-02-19 17:02:57 +01:00
Sylvia van Os
4680b53f86 Save card details expansion state 2022-02-19 15:44:35 +01:00
Katharine Chui
8423ea9b59 in cardView, hide iconImage manually instead of relying on appBarLayout height 2022-02-19 21:31:16 +08:00
Sylvia van Os
1d8b2d82ed Remove duplicate translation 2022-02-16 23:54:08 +01:00
TheLastProject
1b8e9e4d7c Update contributors 2022-02-13 05:15:15 +00:00
109247019824
db706a02d3 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (241 of 241 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2022-02-11 20:55:41 +01:00
Sylvia van Os
a5901700b4 Fix crash in edit activity on locale without region 2022-02-11 18:45:28 +01:00