Merge branch 'audiorecorder-3.0.31'

This commit is contained in:
Alexey Kuznetsov 2017-07-31 12:21:47 +03:00
commit ba705fc563
2 changed files with 10 additions and 7 deletions

View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23
versionCode 195
versionName "3.0.30"
versionCode 196
versionName "3.0.31"
}
signingConfigs {
release {

View file

@ -409,14 +409,17 @@ public class RecordingActivity extends AppCompatActivity {
}
void edit(boolean show, boolean animate) {
View box = findViewById(R.id.recording_edit_box);
View cut = box.findViewById(R.id.recording_cut);
final ImageView playButton = (ImageView) box.findViewById(R.id.recording_play);
View done = box.findViewById(R.id.recording_edit_done);
if (show) {
setState(getString(R.string.recording_status_edit));
editPlay(false);
View box = findViewById(R.id.recording_edit_box);
MarginBottomAnimation.apply(box, true, animate);
View cut = box.findViewById(R.id.recording_cut);
cut.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -424,7 +427,6 @@ public class RecordingActivity extends AppCompatActivity {
}
});
final ImageView playButton = (ImageView) box.findViewById(R.id.recording_play);
playButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -436,7 +438,6 @@ public class RecordingActivity extends AppCompatActivity {
}
});
View done = box.findViewById(R.id.recording_edit_done);
done.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -450,8 +451,10 @@ public class RecordingActivity extends AppCompatActivity {
pitch.edit(-1);
pitch.stop();
View box = findViewById(R.id.recording_edit_box);
MarginBottomAnimation.apply(box, false, animate);
cut.setOnClickListener(null);
playButton.setOnClickListener(null);
done.setOnClickListener(null);
}
}