Skip to content

Commit 0ce559a

Browse files
milovanderlindenmilovanderlinden
committed
Soundrecorder save button
1 parent 11123c4 commit 0ce559a

8 files changed

Lines changed: 38 additions & 17 deletions

File tree

‎app/src/main/java/org/open311/android/SoundRecorderActivity.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class SoundRecorderActivity extends Activity {
3939

4040
// Views for both
4141
FloatingActionButton mRecordAudioControlButton;
42+
FloatingActionButton mRecordSubmitButton;
4243
TextView mRecordingStatus;
4344
Timer mProgressTimer;
4445

@@ -114,6 +115,7 @@ private void setupViews() {
114115
mRecordAudioProgressBar.setMax(MAX_DURATION_MS);
115116
mAudioSeekBar = (Chronometer) findViewById(R.id.record_audio_seekbar);
116117
mRecordAudioControlButton = (FloatingActionButton) findViewById(R.id.record_audio_control_button);
118+
mRecordSubmitButton = (FloatingActionButton) findViewById(R.id.record_submit);
117119
mRecordingStatus = (TextView) findViewById((R.id.recording_status_text));
118120

119121
mOnClickListener = new View.OnClickListener() {
@@ -140,7 +142,14 @@ public void onClick(View v) {
140142
}
141143
}
142144
};
145+
mRecordSubmitButton.setOnClickListener(new View.OnClickListener() {
146+
@Override
147+
public void onClick(View v) {
148+
completeRecording();
149+
}
150+
});
143151

152+
mRecordingStatus.setText(getString(R.string.record_start));
144153
mRecordAudioControlButton.setOnClickListener(mOnClickListener);
145154

146155
mAudioSeekBar.setOnChronometerTickListener(new Chronometer.OnChronometerTickListener() {
@@ -181,8 +190,10 @@ private void startRecording() {
181190
try {
182191
mMediaRecorder.start();
183192
mCurrentRecordingState = RecordingState.STARTED;
193+
mRecordSubmitButton.setVisibility(View.INVISIBLE);
184194
mRecordAudioControlButton.setImageDrawable(ContextCompat.getDrawable(SoundRecorderActivity.this.getApplication().getBaseContext(), R.drawable.ic_stop));
185195
mAudioSeekBar.start();
196+
mRecordingStatus.setText(getString(R.string.record_in_progress));
186197
mRecordAudioProgressBar.setVisibility(View.VISIBLE);
187198
} catch (IllegalStateException exception) {
188199
Log.e(LOG_TAG, "Bad state when starting recording", exception);
@@ -203,6 +214,7 @@ private void stopRecording() {
203214
Log.i(LOG_TAG, "Recording stopped");
204215
mCurrentRecordingState = RecordingState.STOPPED;
205216
mRecordAudioControlButton.setImageDrawable(ContextCompat.getDrawable(SoundRecorderActivity.this.getApplication().getBaseContext(), R.drawable.ic_mic_white_24dp));
217+
mRecordSubmitButton.setVisibility(View.VISIBLE);
206218
}
207219

208220

‎app/src/main/java/org/open311/android/fragments/ReportFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ public void onResourceReady(Bitmap bitmap, GlideAnimation anim) {
909909
AlertDialog.Builder builder = new AlertDialog.Builder(getContext(), R.style.AppTheme_Dialog);
910910
builder.setTitle(getString(R.string.post_anonymous))
911911
.setMessage(getString(R.string.post_anonymous_description))
912-
.setPositiveButton(getString(R.string.yes_anonymous), new DialogInterface.OnClickListener() {
912+
.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
913913
public void onClick(DialogInterface dialog, int which) {
914914
// TODO redirect to profile
915915
TabLayout tabLayout = (TabLayout) getActivity().findViewById(R.id.tabs);

‎app/src/main/res/layout/activity_sound_recorder.xml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@
77
android:layout_height="fill_parent"
88
android:orientation="vertical">
99

10-
<android.support.design.widget.FloatingActionButton
11-
android:id="@+id/record_audio_control_button"
12-
android:layout_width="wrap_content"
13-
android:layout_height="wrap_content"
14-
android:layout_alignParentBottom="true"
15-
android:layout_centerHorizontal="true"
16-
android:layout_marginBottom="10dp"
17-
android:src="@drawable/ic_mic_white_24dp"
18-
app:backgroundTint="?attr/colorPrimary" />
19-
2010
<Chronometer
2111
android:id="@+id/record_audio_seekbar"
2212
android:layout_width="wrap_content"
@@ -51,7 +41,31 @@
5141
android:layout_above="@+id/record_audio_control_button"
5242
android:layout_centerHorizontal="true"
5343
android:layout_marginBottom="60dp"
54-
android:text="@string/record_dialog"
44+
android:text="@string/record_start"
5545
android:textColor="#000000" />
5646

47+
<android.support.design.widget.FloatingActionButton
48+
android:id="@+id/record_audio_control_button"
49+
android:layout_width="wrap_content"
50+
android:layout_height="wrap_content"
51+
android:layout_alignParentBottom="true"
52+
android:layout_centerHorizontal="true"
53+
android:layout_marginBottom="10dp"
54+
android:src="@drawable/ic_mic_white_24dp"
55+
app:backgroundTint="?attr/colorPrimary" />
56+
57+
<android.support.design.widget.FloatingActionButton
58+
android:id="@+id/record_submit"
59+
android:layout_width="wrap_content"
60+
android:layout_height="match_parent"
61+
android:layout_alignParentBottom="true"
62+
android:layout_alignParentRight="true"
63+
android:layout_alignParentEnd="true"
64+
android:layout_gravity="end|bottom"
65+
android:layout_marginBottom="10dp"
66+
android:layout_marginEnd="10dp"
67+
android:layout_marginRight="10dp"
68+
android:visibility="invisible"
69+
android:src="@drawable/ic_done"
70+
app:backgroundTint="@color/colorPrimary" />
5771
</RelativeLayout>

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
<string name="report_upload_title">Hochladen</string>
121121
<string name="servicesDownloaded">dienste heruntergeladen</string>
122122
<string name="connectionEstablished">Verbindung hergestellt</string>
123-
<string name="yes_anonymous">Ja</string>
124123
<string name="no_anonymous">Nein</string>
125124
<string name="post_anonymous">Anonym</string>
126125
<string name="post_anonymous_description">Sie haben keine Kontaktdaten gesetzt. Dies bedeutet, dass verantwortliche Partei nicht in der Lage sein wird, um Sie zu kontaktieren. Wollen Sie Kontaktdaten jetzt hinzufügen?</string>

‎app/src/main/res/values-fi/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
<string name="report_upload_title">Lataa</string>
121121
<string name="servicesDownloaded">palvelut ladattu</string>
122122
<string name="connectionEstablished">Yhteys muodostettu</string>
123-
<string name="yes_anonymous">Kyllä</string>
124123
<string name="no_anonymous">Ei</string>
125124
<string name="post_anonymous">Anonyymi</string>
126125
<string name="post_anonymous_description">Et ole asettanut mitään yhteystietoja. Tämä tarkoittaa sitä, että vastuullinen osapuoli ei voi ottaa sinuun yhteyttä. Haluatko lisätä yhteystiedot nyt?</string>

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
<string name="report_upload_title">Télécharger</string>
121121
<string name="servicesDownloaded">services téléchargés</string>
122122
<string name="connectionEstablished">Connection établie</string>
123-
<string name="yes_anonymous">Oui</string>
124123
<string name="no_anonymous">Non</string>
125124
<string name="post_anonymous">Anonyme</string>
126125
<string name="post_anonymous_description">Vous avez pas réglé détails de contact. Cela signifie que la partie responsable ne sera pas en mesure de vous contacter. Voulez-vous ajouter des détails de contact maintenant?</string>

‎app/src/main/res/values-nl/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
<string name="report_upload_started">Upload gestart</string>
138138
<string name="report_upload_title">Upload</string>
139139
<string name="report_upload_progress">%1$d/%2$d geupload.</string>
140-
<string name="yes_anonymous">Ja</string>
141140
<string name="no_anonymous">Nee, stuur anoniem</string>
142141
<string name="post_anonymous">Contactgegevens</string>
143142
<string name="post_anonymous_description">Stel je gegevens in, dan kunnen wij contact met je opnemen. Wil je je contactgegevens instellen?</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
<string name="report_upload_started">Upload started</string>
119119
<string name="report_upload_title">Upload</string>
120120
<string name="report_upload_progress">Uploaded %1$d/%2$d.</string>
121-
<string name="yes_anonymous">Yes</string>
122121
<string name="no_anonymous">No, post anonymous</string>
123122
<string name="post_anonymous">Anonymous</string>
124123
<string name="post_anonymous_description">You haven\'t set any contact details. This means that responsible party will not be able to contact you. Do you want to add contact details now?</string>

0 commit comments

Comments
 (0)