mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-03-04 23:27:09 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,949 Commits 40 Branches 157 Tags
e6ccef8ad08b34f18d19ff4e8dddfa9dced17700
Commit Graph

1231 Commits

Author SHA1 Message Date
mondstern
e6ccef8ad0 Translated using Weblate (Icelandic) 
Currently translated at 25.6% (57 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/is/
 2021-10-24 00:04:22 +02:00
Still Hsu
d774231c05 Add zh-tw strings 2021-10-24 05:54:36 +08:00
mondstern
6ab61eb78a Added translation using Weblate (Icelandic) 2021-10-23 21:31:36 +02:00
Sylvia van Os
70510ed9d1 Fix unit tests 2021-10-22 23:33:50 +02:00
Sylvia van Os
dfa237958e Fix several small sizing bugs 2021-10-22 22:17:13 +02:00
Ankit Tiwari
127d53e85a Save Size of code (#508) 2021-10-22 21:11:51 +02:00
mondstern
662eb853d7 Translated using Weblate (Portuguese) 
Currently translated at 23.8% (53 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/
 2021-10-21 22:37:14 +02:00
mondstern
d8e58f8b38 Translated using Weblate (Esperanto) 
Currently translated at 52.2% (116 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/eo/
 2021-10-21 22:37:14 +02:00
mondstern
4748e24dda Translated using Weblate (Romanian) 
Currently translated at 59.0% (131 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ro/
 2021-10-21 22:37:13 +02:00
mondstern
8adc013330 Added translation using Weblate (Portuguese) 2021-10-20 21:44:55 +02:00
mondstern
d80a71c852 Translated using Weblate (Danish) 
Currently translated at 52.7% (117 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/da/
 2021-10-20 20:07:38 +02:00
IllusiveMan196
c35c316788 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2021-10-20 20:07:33 +02:00
Petr Novák
d68f0c60d4 Translated using Weblate (Czech) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/cs/
 2021-10-20 20:07:33 +02:00
waffshappen
5faa28a7e7 Replace AsyncTask with a Compatiblity Layer and further Compat Fixes (#511) 2021-10-20 19:47:06 +02:00
109247019824
3149234f5d Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2021-10-19 15:39:48 +02:00
Gediminas Murauskas
dcf55c93a8 Translated using Weblate (Lithuanian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/
 2021-10-19 15:39:48 +02:00
bors[bot]
3f3394c1e9 Merge #507 
507: feat/copyable-textview r=TheLastProject a=aditya3901

## Issue Fix
Fixes #389 
Made textviews copyable :)

Co-authored-by: aditya3901 <2020itb058.aditya@students.iiests.ac.in>
 2021-10-18 16:06:10 +00:00
aditya3901
2b22dd4a1f feat/copyable-textview 2021-10-18 14:29:30 +05:30
Oğuz Ersen
eaafa56503 Translated using Weblate (Turkish) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
 2021-10-17 17:41:02 +02:00
solokot
09c6d58639 Translated using Weblate (Russian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-10-17 17:41:02 +02:00
Heimen Stoffels
1767a009a7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-10-17 17:41:02 +02:00
Allan Nordhøy
a2e25512ec 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-10-17 17:41:02 +02:00
J. Lavoie
824b931764 Translated using Weblate (Italian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-10-17 17:41:02 +02:00
J. Lavoie
0cb75fd421 Translated using Weblate (French) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-10-17 17:41:02 +02:00
J. Lavoie
36f0d814f6 Translated using Weblate (German) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-10-17 17:41:02 +02:00
Miha Frangež
ff63dbfdaa Fixed bad machine translations 2021-10-17 17:16:44 +02:00
Miha Frangež
5cacdbd192 New Slovenian translations 2021-10-17 17:07:32 +02:00
Ankit Tiwari
c99bf206cc Dynamically size barcode based on their shape (square or rectangle) (#501) 2021-10-17 14:42:56 +02:00
TheLastProject
bef750e047 Update contributors 2021-10-17 05:10:28 +00:00
bors[bot]
7692f19ea6 Merge #494 
494: Inter Related Code changes for exporting encrypted zip r=TheLastProject a=ankittiwari101

1. Created new method `multipleCardsExportImportPasswordProtected()` in ImportExportTest.java
2. Added 5th Parameter `char[] password` to exportData method of MultiFormater.java
3. From this new method passed password field to `importData` and `exportData` method calls.
4. In CatimaExporter.java added a password parameter to ZipOutputStream(output,password) if a non null char[] array of non zero length is received for password parameter and setEncryptFiles(true) using AES 256 Encryption(by default)"

Remaining - Dialogue Box for entering password.

Note - This is only a draft pull request, if everything here looks good, I'll work next on The Password Dialog which is the final piece in the puzzle.

Co-authored-by: Ankit Tiwari <ankitr.tiwari@gmail.com>
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
 2021-10-16 15:13:11 +00:00
Sylvia van Os
d8361cc288 String improvements 2021-10-16 16:49:47 +02:00
Ankit Tiwari
7028a1f4ca Changes to AlertDialog for entering password 2021-10-16 20:04:24 +05:30
Ankit Tiwari
32d62dd9ba Requested Modifications Made. 2021-10-16 01:34:44 +05:30
Ankit Tiwari
401fc98b4d Passing password to ZipInputStream constructor in importData method of CatimaImporter.java 2021-10-16 00:15:32 +05:30
Ankit Tiwari
993589427b Changed password parameter to a char[] instead of null in ImportExportTest.java line 613 2021-10-15 23:10:38 +05:30
Ankit Tiwari
2390568bdf Added Encrypted Backup feature.The Zip File is Password Protected, which is asked from the user at the time of export immediately on click of Export Button. 2021-10-15 22:51:52 +05:30
Ankit Tiwari
44066e6599 Extracted zip parameter logic into a new function and used it on imageZipParameters as well 2021-10-15 00:22:51 +05:30
Ankit Tiwari
fc9c616869 1.Created new method multipleCardsExportImportPasswordProtected() in ImportExportTest.java \n 2.Added 5th Paramete 2021-10-14 23:23:01 +05:30
Ankit Tiwari
97a5311593 Fixed Bug where an Empty List (consisting of only a single textview) within the Tab would not swipe left or right 2021-10-13 16:55:05 +05:30
Sylvia van Os
d2b2a53109 Merge pull request #485 from TacoTheDank/materialCardview 
Use MaterialCardView
 2021-10-11 21:27:30 +02:00
Sylvia van Os
6887cd098b Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-10-11 21:19:15 +02:00
Sylvia van Os
0881d745f5 Fix more spotbugs EI_EXPOSE_REP2 2021-10-11 21:18:22 +02:00
Joel A
edce6d6cd3 Translated using Weblate (Swedish) 
Currently translated at 99.0% (218 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2021-10-11 20:22:20 +02:00
solokot
23dc47a5b9 Translated using Weblate (Russian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-10-11 20:22:20 +02:00
Sylvia van Os
683b4f46d9 Fix spotbugs EI_EXPOSE_REP2 2021-10-11 20:22:06 +02:00
Sylvia van Os
ac021bce2a Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-10-11 19:58:26 +02:00
Sylvia van Os
b0c34cbca0 Fix spotbugs RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE 2021-10-11 19:58:09 +02:00
TacoTheDank
4a0c8270ef Replace CardView with MaterialCardView 2021-10-10 22:34:53 -04:00
TacoTheDank
793f1e2f87 Remove unneeded MultiDex 2021-10-10 22:34:40 -04:00
avikkundu
0101b6fa25 added translation in bengali (#480) 2021-10-10 17:04:49 +02:00