From 22d7d135b09ba2cab49c397fc00bf9d9a231a0c1 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sat, 26 Mar 2016 19:20:30 +0300 Subject: [PATCH 1/2] small ui fixes --- .../audiorecorder/activities/RecordingActivity.java | 2 +- .../github/axet/audiorecorder/widgets/PitchView.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java index ab53317..3cd4477 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java @@ -461,7 +461,7 @@ public class RecordingActivity extends AppCompatActivity { return; RawSamples rs = new RawSamples(storage.getTempRecording()); - rs.trunk(editSample); + rs.trunk(editSample + 1); rs.close(); edit(false); loadSamples(); diff --git a/app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java b/app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java index f29cd37..0cdf72c 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java +++ b/app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java @@ -167,7 +167,7 @@ public class PitchView extends ViewGroup { Paint p = paint; - if (edit != null && i >= editPos) + if ((edit != null || play != null) && i >= editPos) p = cutColor; // left channel pitch @@ -176,12 +176,12 @@ public class PitchView extends ViewGroup { canvas.drawLine(x, mid, x, mid + mid * right + 1, p); } - if (edit != null && editFlash) { + if ((edit != null || play != null) && editFlash) { float x = editPos * pitchSize + pitchSize / 2f; canvas.drawLine(x, 0, x, getHeight(), editPaint); } - if (edit != null && playPos > 0) { + if (play != null && playPos > 0) { float x = playPos * pitchSize + pitchSize / 2f; canvas.drawLine(x, 0, x, getHeight(), playPaint); } @@ -491,7 +491,7 @@ public class PitchView extends ViewGroup { if (stableCount > 20) { stableRefresh = true; } - stableCount ++; + stableCount++; } if (delay > 0) @@ -519,11 +519,15 @@ public class PitchView extends ViewGroup { handler.removeCallbacks(play); play = null; } + if (edit == null) { + edit(); + } return; } if (edit != null) handler.removeCallbacks(edit); + edit = null; if (draw != null) handler.removeCallbacks(draw); From 844ded7f4f5cb4f03931636908625ec7bbc5f8fa Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sat, 26 Mar 2016 19:20:33 +0300 Subject: [PATCH 2/2] Bump version 1.1.9 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3ad2b02..999bad2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 16 targetSdkVersion 23 - versionCode 29 - versionName "1.1.8" + versionCode 30 + versionName "1.1.9" } signingConfigs { release {