Skip to content

Commit d32dbe1

Browse files
committed
Merge pull request #7 from batumi/master
Speech Recognition Training App Iteration 2 - deployed on Google play on June 17th
2 parents b55034c + ebe4eaf commit d32dbe1

34 files changed

Lines changed: 2873 additions & 376 deletions

‎AndroidManifest.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@
8787
</service>
8888
<service android:name="com.github.opensourcefieldlinguistics.fielddb.service.RegisterUserService" >
8989
</service>
90+
<service android:name="com.github.opensourcefieldlinguistics.fielddb.service.UploadAudioVideoService" >
91+
</service>
92+
<service android:name="com.github.opensourcefieldlinguistics.fielddb.service.KartuliSMSCorpusService" >
93+
</service>
94+
<service android:name="com.github.opensourcefieldlinguistics.fielddb.service.KartuliWebSearchCorpusService" >
95+
</service>
96+
<service android:name="com.github.opensourcefieldlinguistics.fielddb.service.KartuliLegalSearchCorpusService" >
97+
</service>
9098

9199
<provider
92100
android:name="com.github.opensourcefieldlinguistics.fielddb.database.DatumContentProvider"
@@ -105,4 +113,4 @@
105113
</provider>
106114
</application>
107115

108-
</manifest>
116+
</manifest>

‎res/drawable/speech_bubbles.png‎

14.7 KB
Loading
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:layout_weight="2"
6+
android:background="#232323"
7+
android:gravity="center"
8+
android:orientation="horizontal" >
9+
10+
<LinearLayout
11+
android:layout_width="match_parent"
12+
android:layout_height="wrap_content"
13+
android:layout_weight="1"
14+
android:gravity="center"
15+
android:orientation="vertical" >
16+
17+
18+
<ImageButton
19+
android:id="@+id/train_speech_recognizer"
20+
android:layout_width="wrap_content"
21+
android:layout_height="wrap_content"
22+
android:background="#00000000"
23+
android:gravity="center"
24+
android:onClick="onTrainClick"
25+
android:src="@drawable/speech_recognizer_listening" />
26+
27+
<TextView
28+
android:layout_width="wrap_content"
29+
android:layout_height="wrap_content"
30+
android:text="@string/train"
31+
android:textColor="#ffffff" />
32+
33+
<ImageButton
34+
android:id="@+id/run_speech_recognizer"
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content"
37+
android:background="#00000000"
38+
android:gravity="center"
39+
android:onClick="onRecognizeClick"
40+
android:src="@drawable/speech_recognizer_recognizing" />
41+
42+
<TextView
43+
android:layout_width="wrap_content"
44+
android:layout_height="wrap_content"
45+
android:text="@string/recognize"
46+
android:textColor="#cccccc" />
47+
</LinearLayout>
48+
49+
<LinearLayout
50+
android:layout_width="match_parent"
51+
android:layout_height="wrap_content"
52+
android:layout_weight="1"
53+
android:gravity="center"
54+
android:orientation="vertical" >
55+
56+
<TextView
57+
android:layout_width="wrap_content"
58+
android:layout_height="wrap_content"
59+
android:clickable="true"
60+
android:gravity="center"
61+
android:onClick="goToWebSite"
62+
android:text="@string/app_explanation"
63+
android:textColor="#ffffff" />
64+
65+
</LinearLayout>
66+
67+
</LinearLayout>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:layout_width="fill_parent"
5+
android:layout_height="fill_parent"
6+
android:orientation="vertical"
7+
>
8+
<android.support.v4.view.ViewPager
9+
android:id="@+android:id/viewpager"
10+
android:layout_width="fill_parent"
11+
android:layout_height="fill_parent"
12+
/>
13+
</LinearLayout>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:id="@+id/datum_detail_container"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
tools:context=".SpeechRecognitionActivity"
7+
tools:ignore="MergeRootFrame" />

‎res/layout/activity_welcome.xml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="fill_parent"
4+
android:layout_height="fill_parent"
5+
android:background="#232323"
6+
android:gravity="center" >
7+
8+
<LinearLayout
9+
android:layout_width="match_parent"
10+
android:layout_height="match_parent"
11+
android:gravity="center"
12+
android:orientation="vertical" >
13+
14+
<ImageButton
15+
android:id="@+id/train_speech_recognizer"
16+
android:layout_width="wrap_content"
17+
android:layout_height="wrap_content"
18+
android:background="#00000000"
19+
android:gravity="center"
20+
android:onClick="onTrainClick"
21+
android:src="@drawable/speech_recognizer_listening" />
22+
23+
<TextView
24+
android:layout_width="wrap_content"
25+
android:layout_height="wrap_content"
26+
android:text="@string/train"
27+
android:textColor="#ffffff" />
28+
29+
<ImageButton
30+
android:id="@+id/run_speech_recognizer"
31+
android:layout_width="wrap_content"
32+
android:layout_height="wrap_content"
33+
android:background="#00000000"
34+
android:gravity="center"
35+
android:onClick="onRecognizeClick"
36+
android:src="@drawable/speech_recognizer_recognizing" />
37+
38+
<TextView
39+
android:layout_width="wrap_content"
40+
android:layout_height="wrap_content"
41+
android:text="@string/recognize"
42+
android:textColor="#cccccc" />
43+
44+
<TextView
45+
android:layout_width="wrap_content"
46+
android:layout_height="wrap_content"
47+
android:gravity="center"
48+
android:onClick="goToWebSite"
49+
android:clickable="true"
50+
android:text="@string/app_explanation"
51+
android:textColor="#ffffff" />
52+
</LinearLayout>
53+
54+
</ScrollView>

‎res/layout/fragment_datum_detail.xml‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66

77
<ImageView
88
android:id="@+id/image_view"
9-
android:layout_width="fill_parent"
10-
android:layout_height="fill_parent"
9+
android:layout_width="match_parent"
10+
android:layout_height="match_parent"
1111
android:contentDescription="This is the main image representing this example."
1212
android:gravity="center"
13-
android:src="@drawable/ic_launcher"
13+
android:src="@drawable/speech_bubbles"
1414
android:visibility="gone" />
1515

1616
<VideoView
1717
android:id="@+id/video_view"
18-
android:layout_width="fill_parent"
19-
android:layout_height="fill_parent"
18+
android:layout_width="match_parent"
19+
android:layout_height="match_parent"
2020
android:layout_centerInParent="true"
21-
android:background="@drawable/ic_launcher"
21+
android:background="@drawable/speech_bubbles"
2222
android:gravity="center" />
2323

2424
<ScrollView
2525
android:id="@+id/video_controls_padding"
26-
android:layout_width="fill_parent"
27-
android:layout_height="fill_parent"
26+
android:layout_width="match_parent"
27+
android:layout_height="match_parent"
2828
android:layout_alignBottom="@+id/image_view"
2929
android:layout_alignLeft="@+id/image_view"
3030
android:layout_alignRight="@+id/image_view"
@@ -94,6 +94,17 @@
9494
android:scrollHorizontally="false"
9595
android:text=""
9696
android:textColor="#CCCCCC" />
97+
98+
<EditText
99+
android:id="@+id/tags"
100+
android:layout_width="wrap_content"
101+
android:layout_height="wrap_content"
102+
android:gravity="center"
103+
android:hint="@string/tag_hint"
104+
android:inputType="textMultiLine"
105+
android:scrollHorizontally="false"
106+
android:text=""
107+
android:textColor="#FFFFFF" />
97108
</LinearLayout>
98109
</ScrollView>
99110

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="fill_parent"
4+
android:layout_height="fill_parent"
5+
android:background="#ff000000" >
6+
7+
<ImageView
8+
android:id="@+id/image_view"
9+
android:layout_width="match_parent"
10+
android:layout_height="match_parent"
11+
android:contentDescription="This is the main image representing this example."
12+
android:gravity="center"
13+
android:src="@drawable/speech_bubbles"
14+
android:visibility="gone" />
15+
16+
<VideoView
17+
android:id="@+id/video_view"
18+
android:layout_width="match_parent"
19+
android:layout_height="match_parent"
20+
android:layout_centerInParent="true"
21+
android:background="@drawable/speech_bubbles"
22+
android:gravity="center" />
23+
24+
<ScrollView
25+
android:id="@+id/video_controls_padding"
26+
android:layout_width="match_parent"
27+
android:layout_height="match_parent"
28+
android:layout_alignBottom="@+id/image_view"
29+
android:layout_alignLeft="@+id/image_view"
30+
android:layout_alignRight="@+id/image_view"
31+
android:layout_alignTop="@+id/image_view"
32+
android:gravity="center" >
33+
34+
<LinearLayout
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content"
37+
android:layout_gravity="center"
38+
android:background="#55000000"
39+
android:gravity="center"
40+
android:orientation="vertical" >
41+
42+
<EditText
43+
android:id="@+id/orthography"
44+
android:layout_width="wrap_content"
45+
android:layout_height="wrap_content"
46+
android:gravity="center"
47+
android:hint="@string/orthography"
48+
android:inputType="textMultiLine"
49+
android:scrollHorizontally="false"
50+
android:text=""
51+
android:textColor="#FFFFFF"
52+
android:textSize="25sp" />
53+
54+
<EditText
55+
android:id="@+id/translation"
56+
android:layout_width="wrap_content"
57+
android:layout_height="wrap_content"
58+
android:gravity="center"
59+
android:hint="@string/translation_hint"
60+
android:inputType="textMultiLine"
61+
android:scrollHorizontally="false"
62+
android:text=""
63+
android:textColor="#FFFFFF"
64+
android:textSize="25sp" />
65+
66+
<EditText
67+
android:id="@+id/context"
68+
android:layout_width="wrap_content"
69+
android:layout_height="wrap_content"
70+
android:gravity="center"
71+
android:hint="@string/context"
72+
android:inputType="textMultiLine"
73+
android:scrollHorizontally="false"
74+
android:text=""
75+
android:textColor="#CCCCCC" />
76+
77+
<EditText
78+
android:id="@+id/tags"
79+
android:layout_width="wrap_content"
80+
android:layout_height="wrap_content"
81+
android:gravity="center"
82+
android:hint="@string/tag_hint"
83+
android:inputType="textMultiLine"
84+
android:scrollHorizontally="false"
85+
android:text=""
86+
android:textColor="#FFFFFF" />
87+
</LinearLayout>
88+
</ScrollView>
89+
90+
</RelativeLayout>

0 commit comments

Comments
 (0)