Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
BIN  android/res/drawable/send.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
21 android/res/layout/create_talk_message.xml
@@ -14,6 +14,17 @@
android:src="@drawable/title"
android:onClick="onHomeClick" />
</LinearLayout>
+ <EditText
+ android:id="@+id/newTalkTextInput"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:layout_weight="1"
+ android:imeOptions="actionSend|flagNoEnterAction"
+ android:gravity="top"
+ android:maxLines="4"
+ android:maxLength="1024"
+ android:inputType="text|textCapSentences|textAutoCorrect|textMultiLine|textShortMessage"
+ android:minLines="2"/>
<Button android:id="@+id/record_button"
android:text="Record Audio"
android:layout_width="fill_parent"
@@ -25,15 +36,6 @@
android:drawableRight="@drawable/record"
android:onClick="onRecordClick"
android:textSize="30dp"/>
- <EditText
- android:id="@+id/newTalkTextInput"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- android:layout_weight="1"
- android:imeOptions="actionSend|flagNoEnterAction"
- android:gravity="top"
- android:maxLines="4"
- android:maxLength="1024" android:inputType="text|textCapSentences|textAutoCorrect|textMultiLine|textShortMessage" android:minLines="2"/>
<!-- <Button android:id="@+id/playback_button"
android:text="Playback Audio"
android:layout_width="wrap_content"
@@ -52,5 +54,6 @@
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:onClick="onSendClick"
+ android:drawableRight="@drawable/send"
android:textSize="30dp"/>
</LinearLayout>
View
2  android/res/layout/main.xml
@@ -13,7 +13,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
- android:onClick="onGoHomeClick" />
+ android:onClick="onGoHomeClick"/>
<Button android:id="@+id/title_create_button"
android:text="Create"
android:layout_width="@dimen/title_height"
View
7 android/src/gov/nasa/arc/geocam/talk/activity/GeoCamTalkCreateActivity.java
@@ -87,7 +87,6 @@ public void onPlaybackClick(View v) {
}
public void onRecordClick(View v) {
- // TODO: add this to call the Audio service
if (recorder.isRecording()) {
Log.i("TALKCREATE", "STOP recording now.");
@@ -97,6 +96,7 @@ public void onRecordClick(View v) {
try {
player.playBeepA();
recordButton.setCompoundDrawablesWithIntrinsicBounds(null, null, stopImage, null);
+ recordButton.setText("Recording...");
recorder.startRecording(this.getFilesDir().toString() + "/audio_recording.mp4");
// recorder.toggleRecordingStatus();
Toast.makeText(this, "Recording started", Toast.LENGTH_SHORT).show();
@@ -112,6 +112,7 @@ private void stopRecording() {
try {
player.playBeepB();
recordButton.setCompoundDrawablesWithIntrinsicBounds(null, null, recordImage, null);
+ recordButton.setText("Record Audio");
filename = recorder.stopRecording();
Toast.makeText(this, "Recording stopped", Toast.LENGTH_SHORT).show();
player.startPlaying(filename);
@@ -178,7 +179,9 @@ public void onSendClick(View v) {
@Override
protected void onPause() {
- stopRecording();
+ if (recorder.isRecording()) {
+ stopRecording();
+ }
super.onPause();
}
}

No commit comments for this range

Something went wrong with that request. Please try again.