bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into 'dev'

Browse source 
Add content descriptions to all the image buttons

See merge request !10
This commit is contained in:
Alexey Kuznetsov 2017-07-01 15:53:55 +00:00
commit a9f4e7ef70
4 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -380,6 +380,7 @@ public class RecordingActivity extends AppCompatActivity {
void stopRecording(String status) {
setState(status);
pause.setImageResource(R.drawable.ic_mic_24dp);
pause.setContentDescription(getString(R.string.record_button));
stopRecording();
@ -475,6 +476,7 @@ public class RecordingActivity extends AppCompatActivity {
if (show) {
playButton.setImageResource(R.drawable.ic_pause_black_24dp);
playButton.setContentDescription(getString(R.string.pause_button));
int playUpdate = PitchView.UPDATE_SPEED * sampleRate / 1000;
@ -515,6 +517,7 @@ public class RecordingActivity extends AppCompatActivity {
}
pitch.play(-1);
playButton.setImageResource(R.drawable.ic_play_arrow_black_24dp);
playButton.setContentDescription(getString(R.string.play_button));
}
}
@ -609,6 +612,7 @@ public class RecordingActivity extends AppCompatActivity {
sound.silent();
pause.setImageResource(R.drawable.ic_pause_black_24dp);
pause.setContentDescription(getString(R.string.pause_button));
pitch.record();

3
app/src/main/res/layout/activity_main.xml
View file

@ -30,6 +30,7 @@
android:layout_gravity="bottom|center_horizontal"
android:layout_margin="@dimen/fab_margin"
android:background="?attr/colorAccent"
android:src="@drawable/ic_mic_24dp" />
android:src="@drawable/ic_mic_24dp"
android:contentDescription="@string/record_button" />
</android.support.design.widget.CoordinatorLayout>

18
app/src/main/res/layout/activity_recording.xml
View file

@ -58,14 +58,15 @@
android:layout_height="40dp"
android:background="?attr/roundButton"
android:src="@drawable/ic_content_cut_24dp"
android:text="Cancel" />
android:contentDescription="@string/cut_button" />
<ImageButton
android:id="@+id/recording_play"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/roundButton"
android:src="@drawable/ic_play_arrow_black_24dp" />
android:src="@drawable/ic_play_arrow_black_24dp"
android:contentDescription="@string/play_button" />
<ImageButton
android:id="@+id/recording_edit_done"
@ -73,7 +74,8 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/roundButton"
android:src="@drawable/ic_close_24dp" />
android:src="@drawable/ic_close_24dp"
android:contentDescription="@string/stop_button" />
</com.github.axet.androidlibrary.widgets.EqualLinearLayout>
</FrameLayout>
@ -103,14 +105,15 @@
android:background="?attr/roundButton"
android:gravity="center"
android:src="@drawable/ic_close_24dp"
android:text="Cancel" />
android:contentDescription="@string/cancel_button" />
<ImageButton
android:id="@+id/recording_pause"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="?attr/roundButton"
android:src="@drawable/ic_pause_black_24dp" />
android:src="@drawable/ic_pause_black_24dp"
android:contentDescription="@string/pause_button" />
<ImageButton
android:id="@+id/recording_done"
@ -118,9 +121,10 @@
android:layout_height="40dp"
android:background="?attr/roundButton"
android:tint="@android:color/white"
android:src="@drawable/ic_done_black_24dp" />
android:src="@drawable/ic_done_black_24dp"
android:contentDescription="@string/stop_button" />
</com.github.axet.androidlibrary.widgets.EqualLinearLayout>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>

6
app/src/main/res/values/strings.xml
View file

@ -68,4 +68,10 @@
<string name="recording_title">Recording</string>
<string name="open_recording_folder">Open Recording Folder</string>
<string name="recording_list_is_empty">Recording List is Empty\n\nClick Record to Start Recording</string>
<string name="record_button">Record</string>
<string name="cut_button">Cut</string>
<string name="play_button">Play</string>
<string name="stop_button">Stop</string>
<string name="cancel_button">Cancel</string>
<string name="pause_button">Pause</string>
</resources>