mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-19 20:38:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,364 Commits 43 Branches 156 Tags
36ff4ca9aeb108e7403f88eb9b378ca1908dbd2c
Commit Graph

1346 Commits

Author SHA1 Message Date
Sylvia van Os
36ff4ca9ae Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2022-01-02 21:40:57 +01:00
Sylvia van Os
a7a775bc01 Put all barcode related fields together in the edit screen 2022-01-02 21:40:44 +01:00
TheLastProject
d376569ba1 Update contributors 2022-01-02 05:17:10 +00:00
Sylvia van Os
3883617a34 Smaller header when details are hidden 2022-01-02 00:10:37 +01:00
vesp
7fc2bdc46e Translated using Weblate (Czech) 
Currently translated at 87.6% (205 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/cs/
 2022-01-01 18:54:31 +01:00
Maciej Błędkowski
70ad884aa3 Translated using Weblate (Polish) 
Currently translated at 100.0% (234 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pl/
 2021-12-31 13:50:31 +01:00
Sylvia van Os
af831cfdbd Fixed pressing the save button multiple times creating multiple entries 
Fixes #691
 2021-12-26 21:20:27 +01:00
TheLastProject
958dc29689 Update contributors 2021-12-26 05:16:50 +00:00
Sylvia van Os
934ef22a8c Translated using Weblate (Hebrew (Israel)) 
Currently translated at 33.7% (79 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/he_IL/
 2021-12-20 12:51:14 +01:00
IllusiveMan196
2e7cbcbac9 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (234 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2021-12-19 08:33:17 +01:00
Yevgeny M
eb5161a382 Translated using Weblate (Hebrew (Israel)) 
Currently translated at 34.1% (80 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/he_IL/
 2021-12-19 08:33:16 +01:00
TheLastProject
ad344c7d12 Update contributors 2021-12-19 05:16:53 +00:00
Sylvia van Os
d4e388cf5d Fix some crashes after DB refactor 2021-12-16 22:49:22 +01:00
Nyatsuki
c75eed56f0 Translated using Weblate (Japanese) 
Currently translated at 99.1% (232 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ja/
 2021-12-16 10:51:04 +01:00
bors[bot]
8ce0ce82ef Merge #680 
680: Cleanup DBHelper r=TheLastProject a=TheLastProject

Should fix #661 

Supersedes #678 

While #678 does fix the issue too, the real issue was that an importer could cause such a state issue. So I've instead been seriously cleaning up. While all the tests pass, I do want to test this slightly longer before merging it into master.

Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2021-12-14 19:24:29 +00:00
Katharine Chui
ab6e90d9f6 reload main activity with splash screen skip 2021-12-15 00:38:17 +08:00
Katharine
9df22f18f0 671 adding English to list of languages, 672 relaunch main activity after language change 2021-12-15 00:33:15 +08:00
bors[bot]
2eeec777d7 Merge #684 
684: 681 fix star icon vector graphics, star color by theme when selected r=TheLastProject a=Kethen

#681 please review
![image](https://user-images.githubusercontent.com/22017945/145991885-991e09d5-913f-499d-94b1-03ae6326eb9f.png)
![image](https://user-images.githubusercontent.com/22017945/145992155-589f45d0-218b-4ab9-b351-2a58d19990bc.png)

![image](https://user-images.githubusercontent.com/22017945/145992048-a08f8e88-bce3-4bfc-a112-35dd991f4516.png)
![image](https://user-images.githubusercontent.com/22017945/145992074-e7699e72-e4d4-44d5-851c-5cd3c453a745.png)


Co-authored-by: Katharine Chui <kwchuiaa@connect.ust.hk>
 2021-12-14 16:27:57 +00:00
Katharine Chui
1d41039de2 674 currency symbol order fixes (#679) 2021-12-14 17:26:18 +01:00
Katharine Chui
112b4a034c fix card icon layout 2021-12-14 20:16:36 +08:00
Katharine Chui
8c06427976 681 fix vector graphics, star color by theme when selected 2021-12-14 19:41:11 +08:00
Oğuz Ersen
3f3f289f62 Translated using Weblate (Turkish) 
Currently translated at 100.0% (234 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
 2021-12-14 02:53:59 +01:00
Joel A
bf2b28065d Translated using Weblate (Swedish) 
Currently translated at 100.0% (234 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2021-12-14 02:53:58 +01:00
Eric
d00d25ad00 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 80.7% (189 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/zh_Hans/
 2021-12-14 02:53:58 +01:00
solokot
f1371daecb Translated using Weblate (Russian) 
Currently translated at 100.0% (234 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-12-14 02:53:58 +01:00
Heimen Stoffels
2fecc524f0 Translated using Weblate (Dutch) 
Currently translated at 100.0% (234 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-12-14 02:53:58 +01:00
Altons
f5beffcad5 Translated using Weblate (French) 
Currently translated at 100.0% (234 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-12-14 02:53:58 +01:00
Altons
b78bdb3ced Translated using Weblate (German) 
Currently translated at 100.0% (234 of 234 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-12-14 02:53:57 +01:00
Sylvia van Os
f2e820f7bb Cleanup DBHelper 2021-12-13 22:47:12 +01:00
Katharine
cf38357f3e spotbug 2021-12-13 17:32:44 +08:00
Katharine
9862a9912f 619 adapt star color to card icon 2021-12-13 16:52:21 +08:00
Katharine
990968a67b 635 trigger requestLayout on possible card text view shrink 2021-12-13 15:08:46 +08:00
Sylvia van Os
3331cf9ccf Make spotBugs happy 2021-12-12 19:25:51 +01:00
Sylvia van Os
8a45222783 Simplify card shortcut code 2021-12-12 19:18:13 +01:00
Heimen Stoffels
3265a9eb4d Translated using Weblate (Dutch) 
Currently translated at 100.0% (233 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-12-12 11:45:54 +01:00
Michael Moroni
c0ed86818f Translated using Weblate (Italian) 
Currently translated at 100.0% (233 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-12-12 11:45:54 +01:00
TheLastProject
d12a4bf75d Update contributors 2021-12-12 05:16:31 +00:00
Oğuz Ersen
5ef9aad5a7 Translated using Weblate (Turkish) 
Currently translated at 100.0% (233 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
 2021-12-09 21:53:28 +01:00
Joel A
d9fd3fd001 Translated using Weblate (Swedish) 
Currently translated at 99.5% (232 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2021-12-09 21:53:28 +01:00
J. Lavoie
f9f3efe1e2 Translated using Weblate (Finnish) 
Currently translated at 71.6% (167 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fi/
 2021-12-09 21:53:27 +01:00
IllusiveMan196
19ad303508 Translated using Weblate (Ukrainian) 
Currently translated at 99.5% (232 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2021-12-09 21:53:27 +01:00
solokot
d5b9bb9ca1 Translated using Weblate (Russian) 
Currently translated at 99.5% (232 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-12-09 21:53:26 +01:00
Heimen Stoffels
c50661f1bd Translated using Weblate (Dutch) 
Currently translated at 99.5% (232 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-12-09 21:53:26 +01:00
J. Lavoie
afd8d2e675 Translated using Weblate (Italian) 
Currently translated at 99.5% (232 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-12-09 21:53:26 +01:00
Altons
be8765aab1 Translated using Weblate (French) 
Currently translated at 100.0% (233 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-12-09 21:53:25 +01:00
J. Lavoie
5656751a14 Translated using Weblate (French) 
Currently translated at 100.0% (233 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-12-09 21:53:25 +01:00
Altons
12b81f7fe5 Translated using Weblate (German) 
Currently translated at 100.0% (233 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-12-09 21:53:24 +01:00
J. Lavoie
3ff64d9abc Translated using Weblate (German) 
Currently translated at 100.0% (233 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-12-09 21:53:24 +01:00
Altons
0a39a8bb5b Translated using Weblate (English) 
Currently translated at 100.0% (233 of 233 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/en/
 2021-12-09 21:53:24 +01:00
Altonss
2975c46f96 Update ManageGroupActivity.java 
Fix long press to add card to group
 2021-12-09 19:28:00 +01:00