Skip to content
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
267 commits
Select commit Hold shift + click to select a range
43f540b
first commit for Gruppo1 for inizialize gradle and configuration files
mattia1142866 Nov 2, 2018
04c47a7
Force both activities in portrait mode
GiovanniFurlan Nov 2, 2018
05e76b4
Preview blocked after first image
thomasporro Nov 3, 2018
924465f
aggiornamento senza successo
Nov 3, 2018
08c73b5
Merge pull request #3 from PrandiniUniPD/gruppo1-molinaro
mattia1142866 Nov 3, 2018
c808d47
Merge branch 'gruppo1' into gruppo1-fasan
mattia1142866 Nov 3, 2018
4517925
Merge pull request #4 from PrandiniUniPD/gruppo1-fasan
mattia1142866 Nov 3, 2018
bfe13c7
Merge branch 'gruppo1' into gruppo1-porro
mattia1142866 Nov 3, 2018
104a47b
Merge pull request #5 from PrandiniUniPD/gruppo1-porro
mattia1142866 Nov 3, 2018
61bd6aa
ita.traineddata removed, OCRWrapper renamed in OCRInterface
PietroPrandini Nov 3, 2018
999ff09
Merge pull request #2 from PrandiniUniPD/workingbranch2_-_merging_pro…
PrandiniUniPD Nov 3, 2018
a354ee0
initial commit from merge_2+3
PietroPrandini Nov 3, 2018
3c14621
Merge branch 'gruppo1' into workingbranch_g2_merge_1+2+3
PietroPrandini Nov 3, 2018
2ad2f8e
Many conflicts resolved
PietroPrandini Nov 3, 2018
ba57b5c
initial commit from skeleton2
PietroPrandini Nov 3, 2018
bb9dd88
apply changes for method takePhoto, found problem with creation direc…
mattia1142866 Nov 4, 2018
c038c0c
general modules.xml (not related to only a person), build.gradle with…
PietroPrandini Nov 4, 2018
30cdcfe
Merge branch 'workingbranch_g2_merge_1+2+3' of https://github.com/Pra…
mattia1142866 Nov 4, 2018
801ba8d
Integrato internalStorageManager e aggiunto visualizzazione ultima foto
frankplus Nov 4, 2018
a217ae9
Merge pull request #10 from PrandiniUniPD/workingbranch_g3_merge_1+2+3
frankplus Nov 4, 2018
0dd3c0b
bug fixes
lucamoroz Nov 4, 2018
cb84797
Implementation gyroscope
GiovanniFurlan Nov 4, 2018
ea5008b
UI changes, smaller take picture btn, add fab button to take new picture
frankplus Nov 4, 2018
ae1bd28
Merge branch 'CommonDemo_GF_gr2' into CommonDemo
GiovanniFurlan Nov 4, 2018
a39649d
Merge remote-tracking branch 'origin/CommonDemo' into CommonDemo
GiovanniFurlan Nov 4, 2018
0b25aab
Rewrite DeviceOrientation class specs
GiovanniFurlan Nov 4, 2018
c9db477
Code more cleaned + toUpperCase removed form the String of the text e…
PietroPrandini Nov 5, 2018
e601ccb
Rotation bug Resolved in CameraActivity, method imageOrientation ?
PietroPrandini Nov 5, 2018
e09ec31
Scrolling View only programmatically
PietroPrandini Nov 5, 2018
449c179
TODO modified
PietroPrandini Nov 5, 2018
bbd0ecf
Update app/src/main/java/unipd/se18/ocrcamera/CameraActivity.java
Andrea-Ton Nov 5, 2018
5971f7b
Merge pull request #17 from PrandiniUniPD/TextRetrievedBug
PrandiniUniPD Nov 6, 2018
1cf67a4
Merge branch 'CommonDemo' into RotationBug
PietroPrandini Nov 6, 2018
8dd4eaf
Merged with the actual CommonDemo (scroll only programmatically)
PietroPrandini Nov 6, 2018
6e52b83
Log
PietroPrandini Nov 6, 2018
2159669
Comment about SurfaceOrientations
PietroPrandini Nov 6, 2018
e131afc
Created skeleton for testing the OCR
lucamoroz Nov 7, 2018
70a7d06
updated skeleton
lucamoroz Nov 7, 2018
e73c37c
few updates to skeleton
frankplus Nov 8, 2018
b18c85d
updated skeleton, added test class, added Utils class, started testAn…
lucamoroz Nov 8, 2018
dd95991
Merge remote-tracking branch 'origin/photo_testing' into photo_testing
frankplus Nov 8, 2018
23d5fee
Correct load of test set
frankplus Nov 8, 2018
e04684e
Rename a method
frankplus Nov 8, 2018
6ac7c14
Tests of tasks
PietroPrandini Nov 8, 2018
98a3253
Comments
PietroPrandini Nov 8, 2018
6562a32
onResume ResultActivity
PietroPrandini Nov 8, 2018
c6ae107
updated skeleton, filled some methods
lucamoroz Nov 8, 2018
38bde08
Merge remote-tracking branch 'origin/photo_testing' into photo_testing
frankplus Nov 8, 2018
8fb24e4
Text retrieved in preferences
PietroPrandini Nov 8, 2018
65266eb
code cleaning + TODO
PietroPrandini Nov 8, 2018
d3e1fe7
fixed get ingredients array from JSON
lucamoroz Nov 9, 2018
8faaa05
new JSON format for a better report
lucamoroz Nov 9, 2018
4f4e2c3
Better Performance
GiovanniFurlan Nov 9, 2018
4cf380f
Second Commit
GiovanniFurlan Nov 9, 2018
fba6f46
Add reset preferences on take photo button
GiovanniFurlan Nov 9, 2018
37df780
no_text_found string to the TextView if nothing is recognized
PietroPrandini Nov 9, 2018
4167976
Initial commit
leopardo-rossi-developer Nov 10, 2018
8243b25
AdapterTestEntry skeleton
leopardo-rossi-developer Nov 10, 2018
f5eccd1
Merge pull request #21 from PrandiniUniPD/photo_testing_JSONReport
lucamoroz Nov 10, 2018
58c8db8
Renamed TestInstance2 into TestInstance
frankplus Nov 10, 2018
9847bad
Fixed ArrayList and ReadFrom file
stefanoromanello Nov 10, 2018
3907907
Add JSONReportParser
GiovanniFurlan Nov 10, 2018
41b2246
Fixed getFilePrefix() - getTextFromFile(), updated Utils class, added…
lucamoroz Nov 10, 2018
8960457
Split removing whitespaces using regex
frankplus Nov 11, 2018
957ad44
Comments
GiovanniFurlan Nov 11, 2018
fbe097a
corrected PhotoTesterTest class and UtilsTest class
lucamoroz Nov 11, 2018
7b6059e
first commit - developing state
PietroPrandini Nov 11, 2018
b1867bd
AdapterTestEntry completed?
PietroPrandini Nov 11, 2018
aeccdad
AdapterTestEntry completed? - clean
PietroPrandini Nov 11, 2018
02fe9bc
AdapterTestEntry completed? - clean
PietroPrandini Nov 11, 2018
b59f1d4
AdapterTestEntry completed? - clean
PietroPrandini Nov 11, 2018
236bad4
TestResultActivity - start of the developing
PietroPrandini Nov 11, 2018
a214681
Merge branch 'photo_texting_presentation_JSONReportParser' into photo…
GiovanniFurlan Nov 11, 2018
8a4a1a1
Corrections
leopardo-rossi-developer Nov 12, 2018
b4fee66
Changes
leopardo-rossi-developer Nov 12, 2018
b73a4fe
Add parseReport() and other changes
GiovanniFurlan Nov 12, 2018
0d9dbb4
AdapterTestEntry - redefined view
PietroPrandini Nov 12, 2018
e1808f9
AdapterTestEntry - confidence colors corrected
PietroPrandini Nov 12, 2018
83bbd6d
Corrections
leopardo-rossi-developer Nov 12, 2018
6a17b0a
Corrections
leopardo-rossi-developer Nov 12, 2018
ff4259f
Corrections
leopardo-rossi-developer Nov 12, 2018
ac9397a
Adapter corrections
leopardo-rossi-developer Nov 12, 2018
572b026
Merge branch 'photo_texting_presentation_JSONReportParser' into photo…
PietroPrandini Nov 12, 2018
b5dc984
Merge pull request #20 from PrandiniUniPD/TextExtractorToString
PrandiniUniPD Nov 12, 2018
f29a97f
Merge remote-tracking branch 'origin/CommonDemo' into photo_testing_B…
PietroPrandini Nov 12, 2018
539af92
Conflicts resolved
PietroPrandini Nov 12, 2018
5c3f765
AsyncTask from code of the group3
PietroPrandini Nov 12, 2018
e55a376
Restoring from SharedPreferences adjusted
PietroPrandini Nov 12, 2018
202b1bf
Restoring from SharedPreferences (working on)
PietroPrandini Nov 12, 2018
c1248e0
Restoring from SharedPreferences adjusted definitely
PietroPrandini Nov 12, 2018
b8fd780
working on TestResultActivity
PietroPrandini Nov 12, 2018
2b01089
Merge branch 'photo_testing_presentation' into photo_testing
PietroPrandini Nov 12, 2018
7385197
Merge remote-tracking branch 'origin/photo_testing_Better_performance…
PietroPrandini Nov 12, 2018
e4f76cd
camera activity buttons
PietroPrandini Nov 12, 2018
babab36
added photo testing from Android/data/unipd.se18.orccamera/files/Pict…
lucamoroz Nov 12, 2018
75289b0
Button for launching ocr tests in ResultActivity
PietroPrandini Nov 13, 2018
755dce5
TestResultActivity xml adjusted
PietroPrandini Nov 13, 2018
1e7e6d1
AsyncReport in TestResultActivity
PietroPrandini Nov 13, 2018
6091581
", " after the words of the ingredients and tags
PietroPrandini Nov 13, 2018
6a9c5fb
Access granted from a selected directory but "E/PhotoTester: Error de…
PietroPrandini Nov 13, 2018
753afd4
"E/PhotoTester: Error decoding JSON" resolved
PietroPrandini Nov 13, 2018
c25425e
AsyncTask for tests
PietroPrandini Nov 13, 2018
4aad8f8
Landscape xml
PietroPrandini Nov 13, 2018
713df9b
Logs in ingredientsTextComparison useful to understand what it do
PietroPrandini Nov 13, 2018
7f68ecf
ingredientsTextComparison %
PietroPrandini Nov 13, 2018
e883655
ingredientsTextComparison change of algorithm
frankplus Nov 13, 2018
19a27e2
Merge remote-tracking branch 'origin/photo_testing' into photo_testing
frankplus Nov 13, 2018
40a23ce
Change confidence data type to float
frankplus Nov 13, 2018
730bb6d
Corrected casting bug
frankplus Nov 13, 2018
d8869c0
Better confidence estimation
frankplus Nov 13, 2018
ed9a286
tags in TestResultActivity
PietroPrandini Nov 13, 2018
503f2d0
added CountDownLatch to wait for the text extractor to finish
lucamoroz Nov 13, 2018
7fb1130
added multithreading to launch concurrent tests
lucamoroz Nov 14, 2018
0241b1a
recognized test field is now included in testAndReport()
lucamoroz Nov 14, 2018
45f7a3e
Some works to the logs of the PhotoTester and the TextExtractor class
PietroPrandini Nov 14, 2018
b26389e
Some works to the logs of the PhotoTester and the TextExtractor class
PietroPrandini Nov 14, 2018
555c1af
Some works to the logs of the PhotoTester and the TextExtractor class
PietroPrandini Nov 14, 2018
0538c15
Some works to the logs of the PhotoTester and the TextExtractor class
PietroPrandini Nov 14, 2018
537a50f
Toast of directory for the database data adjusted
PietroPrandini Nov 14, 2018
c699a57
UI changes: Moved test button in menu
frankplus Nov 14, 2018
25e21c1
testAndReport - max concurrent tasks == number of the available cores
PietroPrandini Nov 15, 2018
2ea1411
added write report to file - after a test the report will be saved to…
lucamoroz Nov 15, 2018
d867801
Change of ingredientsTextComparison algorithm
frankplus Nov 15, 2018
ccad802
Change of ingredientsTextComparison algorithm
frankplus Nov 15, 2018
b6328a4
Change of ingredientsTextComparison algorithm
frankplus Nov 16, 2018
b7a1320
Shadow to the TextView of the confidence percentage
PietroPrandini Nov 16, 2018
5394edd
Change of ingredientsTextComparison algorithm
frankplus Nov 16, 2018
9427896
Added extracted Text to the result of TextActivity
stefanoromanello Nov 16, 2018
3a9bf48
test_entry.xml adjusted
PietroPrandini Nov 17, 2018
2123f4d
Change of ingredientsTextComparison algorithm, now using Levenshtein
frankplus Nov 17, 2018
9df39e7
Same FloatingActionButton in the CameraActivity
PietroPrandini Nov 17, 2018
d76fefb
Merge remote-tracking branch 'origin/photo_testing' into photo_testing
PietroPrandini Nov 17, 2018
8277347
Small change
frankplus Nov 17, 2018
93ac5b7
removed finish activity
frankplus Nov 17, 2018
e853a3d
bugfix
frankplus Nov 17, 2018
ddb74e5
Unified TestInstance and TestEntry into TestElement, removed JSONPars…
lucamoroz Nov 17, 2018
75e2884
added TestElement junit tests, removed useless tests and files
lucamoroz Nov 17, 2018
9b4736c
Pic preview added to the result activity of the test
PietroPrandini Nov 18, 2018
0e9d981
AdapterTestEntry log and clean
PietroPrandini Nov 18, 2018
4fa1ab8
added method to get scores for each tag
NicoloCervo Nov 18, 2018
c4c5a78
retro compatibility
NicoloCervo Nov 18, 2018
dea7074
final corrections
NicoloCervo Nov 18, 2018
59504a4
Added statistics to TestResultActivity
frankplus Nov 18, 2018
fbd9119
Merge branch 'photo_testing_tag_results' into photo_testing
frankplus Nov 18, 2018
9402c46
Merge pull request #25 from PrandiniUniPD/photo_testing
PrandiniUniPD Nov 19, 2018
95fcf8c
Changed Camera - Need more work
stefanoromanello Nov 21, 2018
b47a535
Cleaned the code
stefanoromanello Nov 21, 2018
2fe7a04
Removed roundedbutton.xml
stefanoromanello Nov 21, 2018
050a30b
Update build.gradle
Nintenking Nov 22, 2018
0ff671a
Issues fix
leopardo-rossi-developer Nov 22, 2018
9f5e686
Added cool take picture button rotation based on device rotation
frankplus Nov 22, 2018
9c69bdd
Merge pull request #29 from PrandiniUniPD/FixCameraLag
stefanoromanello Nov 22, 2018
de213c5
Merge pull request #32 from PrandiniUniPD/CommonDemo
thomasporro Nov 23, 2018
a17edec
added test photo alteration compatibility - PhotoTester.testAndReport…
lucamoroz Nov 26, 2018
d5cc51d
added get alteration tag method in TestElement
lucamoroz Nov 27, 2018
be50781
First commit
PietroPrandini Nov 27, 2018
fb08eed
First commit
PietroPrandini Nov 27, 2018
7d7770d
details
PietroPrandini Nov 27, 2018
62dc581
Forced portrait mode to TestAlterationsActivity
PietroPrandini Nov 27, 2018
1f4409e
better exception handling, improved specs
lucamoroz Nov 27, 2018
ecb7917
fixed null pointer exception in method run()
lucamoroz Nov 27, 2018
6ee7407
Merge remote-tracking branch 'origin/AdapterAlterationsTest' into pho…
PietroPrandini Nov 28, 2018
e308770
Merge with AdapterAlterationsTest
PietroPrandini Nov 28, 2018
d799b2b
removed try - catch block
lucamoroz Nov 28, 2018
9737e37
removed try - catch block
lucamoroz Nov 28, 2018
918e1a1
OnClickListener
PietroPrandini Nov 28, 2018
6fbcfbc
Removed button in adapterTestAlterations
PietroPrandini Nov 28, 2018
bf79f82
Log
PietroPrandini Nov 28, 2018
315e9b8
fixed setting bitmap alteration
lucamoroz Nov 28, 2018
4f1cae0
Optimized PhotoTester constructor
lucamoroz Nov 28, 2018
85f687e
Removed hardcoded strings
lucamoroz Nov 28, 2018
cebec3d
Initial commit
PietroPrandini Nov 29, 2018
85588a1
Dir
PietroPrandini Nov 29, 2018
fa22ed5
removeMe.md added to preserve the directories structures on github
PietroPrandini Nov 29, 2018
2a6268e
README deleted
PietroPrandini Nov 29, 2018
1424643
.gitignore updated with the version contained in the CommonDemo branch
PietroPrandini Nov 29, 2018
f407930
Gradle files
PietroPrandini Nov 29, 2018
db38e06
Updated javadoc and simplified code
lucamoroz Nov 29, 2018
be06ac7
Preparing branch for the code review
PietroPrandini Nov 30, 2018
e86b2b3
Photo testing alteration implementation (#48)
lucamoroz Nov 30, 2018
c1fdb69
Merge branch 'photo_testing' of https://github.com/PrandiniUniPD/OCRC…
lucamoroz Nov 30, 2018
f302cfa
Added comments - replaced Semaphore availableThreads with a FixedThre…
lucamoroz Nov 30, 2018
84971d9
Avoid null value to orientationResult by initializing
frankplus Nov 30, 2018
bfc9e7e
AdapterTestElement with alterations summary + TestResultActivity more…
PietroPrandini Dec 1, 2018
ef8f343
TestResultActivity more readable for reviews
PietroPrandini Dec 1, 2018
e140d8e
Photo testing (#49)
lucamoroz Dec 1, 2018
871fda7
Merge pull request #50 from PrandiniUniPD/cameraDebug
frankplus Dec 2, 2018
80d1068
Changes requested from the review
PietroPrandini Dec 2, 2018
344e218
Changes requested
PietroPrandini Dec 2, 2018
ceb699f
Added edited photos tags stats
lucamoroz Dec 3, 2018
dbd468b
fixed return missing
lucamoroz Dec 3, 2018
cc8f570
fixed alterations tags gain
lucamoroz Dec 4, 2018
27ecb64
added comments and other changes made during code review
frankplus Dec 4, 2018
5e6abf7
Solved memory leak caused by loading all the photos on the heap memor…
lucamoroz Dec 5, 2018
0b71990
Removing the removeMe.md files
PietroPrandini Dec 6, 2018
9744c31
Removing the removeMe.md files
PietroPrandini Dec 6, 2018
6fbb674
Created activity for download the images from the database
stefanoromanello Dec 6, 2018
f390f30
Added specifications
stefanoromanello Dec 6, 2018
243e8e1
Print errors in case of failure
stefanoromanello Dec 6, 2018
d88fee2
Disabled button while downloading + minor improvements
stefanoromanello Dec 7, 2018
e9ff749
Task solution
leopardo-rossi-developer Dec 7, 2018
3ef8965
Fixed FTP Connection, Buttons and Live messages
stefanoromanello Dec 7, 2018
463579a
Punctualization
leopardo-rossi-developer Dec 7, 2018
307ab7e
Cleaned code + fixed scrollable text view
stefanoromanello Dec 7, 2018
c6ba2e2
Update fixing security issue
stefanoromanello Dec 8, 2018
1a2afd3
Removed constant credentials
stefanoromanello Dec 8, 2018
258b386
Merge pull request #87 from PrandiniUniPD/downloadPhotosFromDb
stefanoromanello Dec 8, 2018
ec5fb69
Covered NaN case in function ingredientsTextComparison
lucamoroz Dec 8, 2018
afcbb18
Covered NaN case in function ingredientsTextComparison
lucamoroz Dec 8, 2018
183c818
Merge branch 'CommonDemo' into photo_testing
lucamoroz Dec 8, 2018
cc5cdd3
Solved conflicts with CommonDemo
lucamoroz Dec 8, 2018
569af03
Improving tests views, starting.
PrandiniUniPD Dec 10, 2018
12ae7f9
Cleaning
PrandiniUniPD Dec 10, 2018
78b8f86
Alterations programmatically if needed
PrandiniUniPD Dec 10, 2018
32dcc09
Formatting alterations
PrandiniUniPD Dec 10, 2018
dc8f69e
Cleaning
PrandiniUniPD Dec 10, 2018
c72058f
Details of alterations view
PrandiniUniPD Dec 10, 2018
c9694ef
Cleaning
PrandiniUniPD Dec 10, 2018
b1968ff
Details
PrandiniUniPD Dec 10, 2018
6fd4d76
Progress bar, working on
PrandiniUniPD Dec 10, 2018
7105c81
details of code styling
PrandiniUniPD Dec 10, 2018
6690956
Fixed progress bar update
lucamoroz Dec 11, 2018
c264c6c
Separated method saveReportToFile from testAndReport
lucamoroz Dec 12, 2018
093311d
Added listener to show progress on TestResultActivity
lucamoroz Dec 12, 2018
fe2b58f
Merge remote-tracking branch 'PietroPrandiniFork/codereview' into res…
PrandiniUniPD Dec 15, 2018
f5dc04c
Merge remote-tracking branch 'PietroPrandiniFork/codereviewB' into re…
PrandiniUniPD Dec 15, 2018
39ef09e
TextExtractor - updates from code reviews
PrandiniUniPD Dec 15, 2018
fe28e82
recognizer package
PrandiniUniPD Dec 15, 2018
d0b35c2
New structure of OCR recognizing system adapted
PrandiniUniPD Dec 15, 2018
73c817f
Processing string in ResultActivity
PrandiniUniPD Dec 15, 2018
eb69c78
Comments
PrandiniUniPD Dec 15, 2018
7631fc0
Details
PrandiniUniPD Dec 15, 2018
89acbbe
Merge remote-tracking branch 'origin/photo_testing' into restructuring
PrandiniUniPD Dec 15, 2018
4a2ec9e
Merging with photo_testing branch
PrandiniUniPD Dec 15, 2018
91b9ee8
Details
PrandiniUniPD Dec 15, 2018
44cb8ee
Renaming
PrandiniUniPD Dec 16, 2018
4bc545b
Details
PrandiniUniPD Dec 16, 2018
0f7d21b
Details
PrandiniUniPD Dec 16, 2018
c6f0437
Details
PrandiniUniPD Dec 16, 2018
2755e98
Pic of alterations in test details
PrandiniUniPD Dec 16, 2018
0812efc
Data by intent from TestsListAdapter to TestDetailsActivity
PrandiniUniPD Dec 16, 2018
9a9a3ce
AddViewBelow methods
PrandiniUniPD Dec 16, 2018
fd87d03
Alterations details programmatically if needed in the TestDetailsActi…
PrandiniUniPD Dec 16, 2018
5922469
Bold to the title added programmatically
PrandiniUniPD Dec 16, 2018
b438af1
ManualTestOnSinglePhoto(On Going)
GiovanniFurlan Dec 17, 2018
af2afda
Update and correction
GiovanniFurlan Dec 18, 2018
65881ba
Layout implements
GiovanniFurlan Dec 18, 2018
e33d32f
Complete ManualTestOnSinglePhoto
GiovanniFurlan Jan 8, 2019
fc17b25
Minor Changes
GiovanniFurlan Jan 10, 2019
f563d71
FInal Correction
GiovanniFurlan Jan 22, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added app/.DS_Store
Binary file not shown.
24 changes: 23 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

//Start - For android testing
testOptions {
unitTests.returnDefaultValues = true
}
//End - For android testing
}

dependencies {
Expand All @@ -25,7 +31,23 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

//for json testing
testImplementation 'org.json:json:20140107'

implementation 'com.google.firebase:firebase-core:16.0.4'
implementation 'com.google.firebase:firebase-ml-vision:18.0.1'
implementation 'com.android.support:design:28.0.0'

implementation group: 'info.debatty', name: 'java-string-similarity', version: '1.1.0'

//CameraKIt dependencies
implementation 'com.camerakit:camerakit:1.0.0-beta3.9'
implementation 'com.camerakit:jpegkit:0.1.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.61'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.24.0'

//FTP dependencies
implementation 'commons-net:commons-net:3.6'
}
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.gms.google-services'
42 changes: 42 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"project_info": {
"project_number": "148989252526",
"firebase_url": "https://gruppo1ingsw1819.firebaseio.com",
"project_id": "gruppo1ingsw1819",
"storage_bucket": "gruppo1ingsw1819.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:148989252526:android:eeb1c8433d22ba11",
"android_client_info": {
"package_name": "unipd.se18.ocrcamera"
}
},
"oauth_client": [
{
"client_id": "148989252526-o2repli8pa7bs3gncg27th5a51hkfum2.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAatL4jOpv6-IIpBlBc9TDffLgpNiyFJjI"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
Binary file added app/src/.DS_Store
Binary file not shown.
Binary file added app/src/main/.DS_Store
Binary file not shown.
45 changes: 37 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="unipd.se18.ocrcamera">

<!-- Permissions for using the camera -->
<!-- Permissions for using the external storage - author (g3) -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />

<!-- Permissions for using the camera - author Pietro Prandini (g2) -->
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera2.full"/>

<application
android:allowBackup="true"
Expand All @@ -13,18 +17,43 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".CameraActivity">

<!-- Content Provider configurations - author (g3) -->
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.example.android.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>

<activity
android:name=".CameraActivity"
android:configChanges="orientation"
android:screenOrientation="portrait" />
<activity
android:name=".ResultActivity"
android:configChanges="orientation"
android:screenOrientation="portrait"
android:value=".CameraActivity" />
<!-- Useful for automatic upgrades of the ocr models - author Pietro Prandini (g2) -->
<meta-data
android:name="com.google.firebase.ml.vision.DEPENDENCIES"
android:value="ocr" />
<!-- To use multiple models: android:value="ocr,model2,model3" -->
<activity android:name=".NavigatorActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ResultActivity"></activity>
<meta-data
android:name="com.google.firebase.ml.vision.DEPENDENCIES"
android:value="ocr" />
<!-- To use multiple models: android:value="ocr,model2,model3" -->
<activity android:name=".TestsListActivity" />
<activity android:name=".DownloadDbActivity" />
<activity android:name=".ManualTestOnSinglePhoto" />
<activity android:name=".TestDetailsActivity"></activity>
</application>

</manifest>
Binary file added app/src/main/java/.DS_Store
Binary file not shown.
Binary file added app/src/main/java/unipd/.DS_Store
Binary file not shown.
Binary file added app/src/main/java/unipd/se18/.DS_Store
Binary file not shown.
Loading