Skip to content

Commit

Permalink
Added javadoc, cleaned code
Browse files Browse the repository at this point in the history
  • Loading branch information
vikramezhil committed Oct 16, 2017
1 parent a14ac9a commit e53af19
Show file tree
Hide file tree
Showing 67 changed files with 287 additions and 102 deletions.
Binary file modified app/.DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
Expand Down
Binary file added app/build/.DS_Store
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Wed Sep 13 11:22:34 IST 2017
#Mon Oct 16 08:30:09 IST 2017
base.0=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/transforms/dex/debug/folders/1000/1f/main
renamed.0=classes.dex
file.0=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/transforms/dex/debug/folders/1000/1f/main/classes.dex
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
#Internal package file, do not edit.
#Wed Sep 13 11:22:34 IST 2017
#Mon Oct 16 08:30:09 IST 2017
8.set=ANDROID_RESOURCE
1.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
1.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xxxhdpi-v4/ic_launcher_round.png
1.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-hdpi-v4/ic_launcher.png
3.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/layout/speech_progress_layout.xml
3.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
15.set=ANDROID_RESOURCE
4.set=ANDROID_RESOURCE
5.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
5.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-mdpi-v4/ic_launcher_round.png
7.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
7.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/AndroidManifest.xml
11.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/layout-v17/activity_droid_speech.xml
7.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xhdpi-v4/ic_launcher_round.png
11.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xxhdpi-v4/ic_launcher.png
11.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
9.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
9.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/resources.arsc
13.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-hdpi-v4/ic_launcher_round.png
13.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
11.set=ANDROID_RESOURCE
0.set=ANDROID_RESOURCE
15.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xxxhdpi-v4/ic_launcher.png
15.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xxhdpi-v4/ic_launcher_round.png
15.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
7.set=ANDROID_RESOURCE
14.set=ANDROID_RESOURCE
3.set=ANDROID_RESOURCE
10.set=ANDROID_RESOURCE
0.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
0.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-hdpi-v4/ic_launcher.png
0.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xxxhdpi-v4/ic_launcher_round.png
6.set=ANDROID_RESOURCE
2.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/transforms/dex/debug/folders/1000/1f/main/classes.dex
2.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/transforms/dex/debug/folders/1000/1f/main
Expand All @@ -35,14 +35,14 @@
6.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
6.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-mdpi-v4/ic_launcher.png
10.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
10.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xxhdpi-v4/ic_launcher.png
10.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/layout-v17/activity_droid_speech.xml
13.set=ANDROID_RESOURCE
8.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
8.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xhdpi-v4/ic_launcher_round.png
8.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/AndroidManifest.xml
2.set=DEX
12.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xhdpi-v4/ic_launcher.png
12.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
14.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xxhdpi-v4/ic_launcher_round.png
14.file=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_/res/mipmap-xxxhdpi-v4/ic_launcher.png
14.base=/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/res/resources-debug.ap_
9.set=ANDROID_RESOURCE
count=16
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/build/outputs/apk/app-debug.apk
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified app/src/.DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,23 @@ protected void onCreate(Bundle savedInstanceState)
@Override
protected void onPause()
{
super.onPause();

if(stop.getVisibility() == View.VISIBLE)
{
stop.performClick();
}

super.onPause();
}

@Override
protected void onDestroy()
{
super.onDestroy();

if(stop.getVisibility() == View.VISIBLE)
{
stop.performClick();
}

super.onDestroy();
}

// MARK: OnClickListener Method
Expand Down Expand Up @@ -121,7 +121,7 @@ public void onDroidSpeechFinalResult(String finalSpeechResult)
// Setting the final speech result
this.finalSpeechResult.setText(finalSpeechResult);

if(droidSpeech.getContinuousVoiceRecognition())
if(droidSpeech.getContinuousSpeechRecognition())
{
int[] colorPallets1 = new int[] {Color.RED, Color.GREEN, Color.BLUE, Color.CYAN, Color.MAGENTA};
int[] colorPallets2 = new int[] {Color.YELLOW, Color.RED, Color.CYAN, Color.BLUE, Color.GREEN};
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion build/intermediates/dex-cache/cache.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
jumboMode="false"
optimize="true"
revision="26.0.1"
sha1="9c96e427f655039e460089f7a175fa0f522c8c2f">
sha1="04cd6a0dad784af048056cd6feaf1bbd76eca1bc">
<dex dex="/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/app/build/intermediates/pre-dexed/debug/classes_ee5f584984ea285ca9391947e69ea58414084f18.jar" />
</item>

Expand Down
27 changes: 27 additions & 0 deletions ds/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,37 @@ android {
versionCode 1
versionName "1.0"
}

buildTypes {
debug {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}

release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}

task javadoc(type: Javadoc) {
failOnError false
source = android.sourceSets.main.java.sourceFiles
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}

artifacts {
archives sourcesJar
archives javadocJar
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,22 @@ public final class R {
public static final class array {
public static final int droid_speech_errors = 0x7f030000;
}
public static final class dimen {
public static final int progressMsgMargin = 0x7f040000;
}
public static final class id {
public static final int recognitionProgressView = 0x7f050000;
public static final int recognitionProgressMsg = 0x7f060001;
public static final int recognitionProgressView = 0x7f060000;
}
public static final class layout {
public static final int speech_progress_layout = 0x7f020000;
}
public static final class string {
public static final int app_name = 0x7f040000;
public static final int internet_not_enabled = 0x7f040001;
public static final int microphone_permissions_required = 0x7f040002;
public static final int unknown_error = 0x7f040003;
public static final int app_name = 0x7f050000;
public static final int ds_internet_not_enabled = 0x7f050001;
public static final int ds_listening = 0x7f050002;
public static final int ds_mic_permissions_required = 0x7f050003;
public static final int ds_progress_layout_error = 0x7f050004;
public static final int ds_unknown_error = 0x7f050005;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,22 @@ public static final class array {
}
public static final class attr {
}
public static final class dimen {
public static final int progressMsgMargin=0x7f040000;
}
public static final class id {
public static final int recognitionProgressView=0x7f050000;
public static final int recognitionProgressMsg=0x7f060001;
public static final int recognitionProgressView=0x7f060000;
}
public static final class layout {
public static final int speech_progress_layout=0x7f020000;
}
public static final class string {
public static final int app_name=0x7f040000;
public static final int internet_not_enabled=0x7f040001;
public static final int microphone_permissions_required=0x7f040002;
public static final int unknown_error=0x7f040003;
public static final int app_name=0x7f050000;
public static final int ds_internet_not_enabled=0x7f050001;
public static final int ds_listening=0x7f050002;
public static final int ds_mic_permissions_required=0x7f050003;
public static final int ds_progress_layout_error=0x7f050004;
public static final int ds_unknown_error=0x7f050005;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,22 @@ public static final class array {
}
public static final class attr {
}
public static final class dimen {
public static int progressMsgMargin=0x7f040000;
}
public static final class id {
public static int recognitionProgressView=0x7f050000;
public static int recognitionProgressMsg=0x7f060001;
public static int recognitionProgressView=0x7f060000;
}
public static final class layout {
public static int speech_progress_layout=0x7f020000;
}
public static final class string {
public static int app_name=0x7f040000;
public static int internet_not_enabled=0x7f040001;
public static int microphone_permissions_required=0x7f040002;
public static int unknown_error=0x7f040003;
public static int app_name=0x7f050000;
public static int ds_internet_not_enabled=0x7f050001;
public static int ds_listening=0x7f050002;
public static int ds_mic_permissions_required=0x7f050003;
public static int ds_progress_layout_error=0x7f050004;
public static int ds_unknown_error=0x7f050005;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,55 +47,105 @@
"startLine": 23,
"startColumn": 4,
"startOffset": 833,
"endColumn": 72,
"endOffset": 901
"endColumn": 48,
"endOffset": 877
},
"from": {
"file": "/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/ds/build/intermediates/bundles/debug/res/values/values.xml",
"position": {
"startLine": 23,
"startColumn": 4,
"startOffset": 833,
"endColumn": 72,
"endOffset": 901
}
"file": "/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/ds/build/intermediates/bundles/debug/res/values/values.xml"
}
},
{
"to": {
"startLine": 24,
"startColumn": 4,
"startOffset": 906,
"endColumn": 97,
"endOffset": 999
"startOffset": 882,
"endColumn": 75,
"endOffset": 953
},
"from": {
"file": "/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/ds/build/intermediates/bundles/debug/res/values/values.xml",
"position": {
"startLine": 24,
"startColumn": 4,
"startOffset": 906,
"endColumn": 97,
"endOffset": 999
"startOffset": 882,
"endColumn": 75,
"endOffset": 953
}
}
},
{
"to": {
"startLine": 25,
"startColumn": 4,
"startOffset": 1004,
"endColumn": 55,
"endOffset": 1055
"startOffset": 958,
"endColumn": 51,
"endOffset": 1005
},
"from": {
"file": "/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/ds/build/intermediates/bundles/debug/res/values/values.xml",
"position": {
"startLine": 25,
"startColumn": 4,
"startOffset": 1004,
"endColumn": 55,
"endOffset": 1055
"startOffset": 958,
"endColumn": 51,
"endOffset": 1005
}
}
},
{
"to": {
"startLine": 26,
"startColumn": 4,
"startOffset": 1010,
"endColumn": 93,
"endOffset": 1099
},
"from": {
"file": "/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/ds/build/intermediates/bundles/debug/res/values/values.xml",
"position": {
"startLine": 26,
"startColumn": 4,
"startOffset": 1010,
"endColumn": 93,
"endOffset": 1099
}
}
},
{
"to": {
"startLine": 27,
"startColumn": 4,
"startOffset": 1104,
"endColumn": 87,
"endOffset": 1187
},
"from": {
"file": "/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/ds/build/intermediates/bundles/debug/res/values/values.xml",
"position": {
"startLine": 27,
"startColumn": 4,
"startOffset": 1104,
"endColumn": 87,
"endOffset": 1187
}
}
},
{
"to": {
"startLine": 28,
"startColumn": 4,
"startOffset": 1192,
"endColumn": 58,
"endOffset": 1246
},
"from": {
"file": "/Users/vikram/Documents/Development/Libraries/Vikram/DroidSpeech/ds/build/intermediates/bundles/debug/res/values/values.xml",
"position": {
"startLine": 28,
"startColumn": 4,
"startOffset": 1192,
"endColumn": 58,
"endOffset": 1246
}
}
}
Expand Down
14 changes: 9 additions & 5 deletions ds/build/intermediates/bundles/debug/R.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
int array droid_speech_errors 0x7f030000
int id recognitionProgressView 0x7f050000
int dimen progressMsgMargin 0x7f040000
int id recognitionProgressMsg 0x7f060001
int id recognitionProgressView 0x7f060000
int layout speech_progress_layout 0x7f020000
int string app_name 0x7f040000
int string internet_not_enabled 0x7f040001
int string microphone_permissions_required 0x7f040002
int string unknown_error 0x7f040003
int string app_name 0x7f050000
int string ds_internet_not_enabled 0x7f050001
int string ds_listening 0x7f050002
int string ds_mic_permissions_required 0x7f050003
int string ds_progress_layout_error 0x7f050004
int string ds_unknown_error 0x7f050005
Loading

0 comments on commit e53af19

Please sign in to comment.