mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-03-14 21:33:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,904 Commits 39 Branches 158 Tags
5cacdbd1929e17e8d60cdf3d6ccf49f2aeec6fb2
Commit Graph

1205 Commits

Author SHA1 Message Date
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
TheLastProject
b979b1fc86 Update contributors 2021-10-10 05:15:20 +00:00
Sylvia van Os
9f0b7604cb Fix botched migration and release 2.7.3 2021-10-10 00:46:20 +02:00
Sylvia van Os
1462911ffa Fix regression and release 2.7.2 2021-10-09 23:50:57 +02:00
Michael Gangolf
a555f1c41b Translated using Weblate (German) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-10-08 17:30:09 +02:00
Heimen Stoffels
dc7e9b541a Translated using Weblate (Dutch) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-10-08 07:04:26 +02:00
Allan Nordhøy
b44ef7dfc0 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 99.5% (219 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-10-08 07:04:25 +02:00
Gediminas Murauskas
4d1f4a64fa Translated using Weblate (Lithuanian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/
 2021-10-08 07:04:24 +02:00
Sylvia van Os
fd7e6e4993 Release Catima 2.7.1 2021-10-07 20:04:19 +02:00
Sylvia van Os
4e203aebfe Improve search with spaces 2021-10-06 21:59:45 +02:00
Sylvia van Os
fb2bede135 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-10-06 19:58:44 +02:00
Sylvia van Os
5a88909cd2 Make spotbugs happy 2021-10-06 19:58:29 +02:00
109247019824
6e5ac2ca3d Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/
 2021-10-06 09:23:05 +02:00
IllusiveMan196
20de874ea1 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2021-10-06 09:23:05 +02:00
Petr Novák
c8a207083b Translated using Weblate (Czech) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/cs/
 2021-10-06 09:23:05 +02:00
Sylvia van Os
2811a14627 Release Catima 2.7.0 2021-10-05 20:28:36 +02:00
Sylvia van Os
71bc304c51 Fix version upgrade 2021-10-05 20:27:11 +02:00
Sylvia van Os
7b0652ff11 Fix no results sometimes not correctly displayed 2021-10-05 20:15:10 +02:00
Sylvia van Os
61a3054655 Cleanup 2021-10-05 20:04:03 +02:00
Sylvia van Os
ebe5289d6e Implement FTS (#455) 
This allows for unicode insensitive search and fast search over both
store and note data
 2021-10-05 19:42:52 +02:00
Sylvia van Os
15ba15c602 Cleanup 2021-10-04 21:03:50 +02:00
Oğuz Ersen
c1b9babf33 Translated using Weblate (Turkish) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/
 2021-10-04 19:08:55 +02:00
IllusiveMan196
2424ab01cf Translated using Weblate (Ukrainian) 
Currently translated at 95.9% (211 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/
 2021-10-04 19:08:55 +02:00
solokot
b38dfeeed7 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-04 19:08:55 +02:00
Thomas Bertels
7912cd190f Translated using Weblate (French) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-10-04 19:08:55 +02:00
Petr Novák
11962ad930 Translated using Weblate (Czech) 
Currently translated at 97.7% (215 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/cs/
 2021-10-04 19:08:55 +02:00
Thomas Bertels
a8e2c65072 Translated using Weblate (English) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/en/
 2021-10-04 19:08:55 +02:00