mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-04-02 14:51:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,302 Commits 40 Branches 158 Tags
4f47ee30baacb42a685b548017933cff0aba89b4
Commit Graph

828 Commits

Author SHA1 Message Date
Sylvia van Os
3eff150835 Implement flashlight toggle on scan 2021-07-11 19:10:38 +02:00
Sylvia van Os
6fd4f617e5 Fix .csv import fallback 2021-07-11 15:52:22 +02:00
Sylvia van Os
621e4ce162 Merge pull request #259 from comradekingu/patch-6 
App strings reworked 4
 2021-07-11 13:40:31 +02:00
Sylvia van Os
e69d6a453b Consistent phrasing 2021-07-11 13:35:53 +02:00
solokot
ba870481dd Translated using Weblate (Russian) 
Currently translated at 100.0% (167 of 167 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-07-11 13:32:42 +02:00
Heimen Stoffels
0c10936e75 Translated using Weblate (Dutch) 
Currently translated at 100.0% (167 of 167 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-07-11 13:32:42 +02:00
Gediminas Murauskas
26cf4250ad Translated using Weblate (Lithuanian) 
Currently translated at 31.7% (53 of 167 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/
 2021-07-11 13:32:42 +02:00
Sylvia van Os
a8d5f38d5c Update privacy policy URL 2021-07-11 13:32:32 +02:00
Sylvia van Os
6df8b7b1ea Generate catima.app share links 2021-07-11 13:31:03 +02:00
Sylvia van Os
964c603405 Only list new format 2021-07-11 12:31:51 +02:00
Sylvia van Os
f64eea6470 Update app/src/main/res/values/strings.xml 
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
 2021-07-11 12:31:22 +02:00
Sylvia van Os
7324353d74 Use location hash instead of query parameters in share URL for increased privacy 2021-07-10 18:33:54 +02:00
Sylvia van Os
c5f0ee3a66 Fix bottom sheet alignment issue 2021-07-10 13:06:00 +02:00
solokot
9744ede674 Translated using Weblate (Russian) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-07-10 05:00:16 +02:00
Heimen Stoffels
43505d427d Translated using Weblate (Dutch) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-07-10 05:00:16 +02:00
Allan Nordhøy
65e54c63ef Translated using Weblate (Norwegian Bokmål) 
Currently translated at 90.9% (151 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-07-10 05:00:15 +02:00
J. Lavoie
31b306d432 Translated using Weblate (Italian) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-07-10 05:00:15 +02:00
J. Lavoie
25bd1de09d Translated using Weblate (French) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-07-10 05:00:15 +02:00
J. Lavoie
c82e0d82a9 Translated using Weblate (German) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-07-10 05:00:14 +02:00
Sylvia van Os
a1f632ace3 Set CharSet 2021-07-09 22:20:00 +02:00
Sylvia van Os
b9ea7fd1ed Create export->import test 2021-07-09 22:08:46 +02:00
Allan Nordhøy
8dff8d392e Fixes to import dialogs 2021-07-08 22:07:47 +00:00
Allan Nordhøy
b10d50d5a0 Revert accidental deletion 2021-07-08 22:05:38 +00:00
Allan Nordhøy
0b54d87f4f App strings reworked 4 2021-07-08 20:47:35 +00:00
Sylvia van Os
a9568d6adb Import and export .csv and images as .zip 2021-07-08 22:27:40 +02:00
Sylvia van Os
18c5aa4707 Support for new Voucher Vault export 2021-07-08 19:59:27 +02:00
Sylvia van Os
f53c61bbec Merge pull request #245 from TheLastProject/feature/StocardImport 
Stocard import
 2021-07-08 19:41:22 +02:00
Sylvia van Os
25c9c67ca2 Make spotBugs happy 2021-07-08 19:37:04 +02:00
Sylvia van Os
2efbf664c9 Finish Stocard importing 2021-07-08 19:29:52 +02:00
Allan Nordhøy
0e5216b010 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 90.1% (147 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-07-08 01:33:02 +02:00
Sylvia van Os
8bad342374 Add UPC-E support 2021-07-07 19:14:11 +02:00
Sylvia van Os
476a219bec getOrDefault requires API level 24 2021-07-06 23:36:21 +02:00
Sylvia van Os
24e19e26ba Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker into feature/StocardImport 2021-07-06 23:29:50 +02:00
Sylvia van Os
c7ddf957fa Clean up unused imports 2021-07-06 23:25:55 +02:00
Sylvia van Os
0de8cd93ad Ask password when import fails with BadPassword 2021-07-06 23:25:05 +02:00
Sylvia van Os
614e5bac2d Mark Fidme and Stocard as beta 2021-07-06 22:44:02 +02:00
Sylvia van Os
e76bd9363c Make Stocard import work 2021-07-06 21:54:19 +02:00
Sylvia van Os
97c508c920 Stocard import skeleton 2021-07-06 00:20:35 +02:00
String E. Fighter
539f8846d8 Translated using Weblate (German) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-07-05 08:33:19 +02:00
J. Lavoie
85b553e17b Translated using Weblate (Finnish) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fi/
 2021-07-02 09:33:32 +02:00
J. Lavoie
6a7bebdbcd Translated using Weblate (Italian) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-07-02 09:33:31 +02:00
J. Lavoie
7f72c3bcaf Translated using Weblate (French) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-07-02 09:33:31 +02:00
J. Lavoie
52bff53756 Translated using Weblate (German) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-07-02 09:33:30 +02:00
solokot
acfcd3d2d2 Translated using Weblate (Russian) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-06-30 05:33:04 +02:00
Heimen Stoffels
24e8d12b73 Translated using Weblate (Dutch) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-06-30 05:33:04 +02:00
Allan Nordhøy
28068dcddc Translated using Weblate (Norwegian Bokmål) 
Currently translated at 90.1% (147 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-06-30 05:33:03 +02:00
Sylvia van Os
3dceec8ec0 Support for password-protected zip files 2021-06-29 22:40:02 +02:00
Sylvia van Os
0cc409d087 Add Fidme test 2021-06-29 20:02:49 +02:00
Sylvia van Os
8d48da431e Adding and viewing front/back images (#215) 
* Adding and viewing front/back images

* Fix import and export

* Fix unit tests

* Smaller preview pictures but clickable to make big

* Implement removing image

* Add card photo direct from camera

* Read Exif rotation info from picture taken

* Fix bad copy-paste

* Refactor to use local file system

* Delete card images when deleting card

* Prepare for image-based unit tests in ViewActivityTest
 2021-06-28 20:40:52 +02:00
IllusiveMan196
c7d0da9e20 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (155 of 155 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2021-06-22 18:33:24 +02:00