From 3e195ef8c91f7294a9b27bd786bf0a15c3b2fc33 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sat, 25 Feb 2017 21:48:35 +0300 Subject: [PATCH 1/3] fix how to --- docs/HOWTO-Translate.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/HOWTO-Translate.md b/docs/HOWTO-Translate.md index 7c21b01..dfa45c4 100644 --- a/docs/HOWTO-Translate.md +++ b/docs/HOWTO-Translate.md @@ -6,7 +6,10 @@ To translate 'Audio Recorder' to your language you need to translate following f * [strings.xml](/app/src/main/res/values/strings.xml) Additional file from 'android-library' - * [https://github.com/axet/android-library/.../strings.xml](https://github.com/axet/android-library/blob/master/src/main/res/values/strings.xml) + * [https://gitlib.com/axet/android-library/.../strings.xml](https://gitlib.com/axet/android-library/blob/master/src/main/res/values/strings.xml) + +Additional file from 'android-audio-library' + * [https://gitlib.com/axet/android-audio-library/.../strings.xml](https://gitlib.com/axet/android-audio-library/blob/master/src/main/res/values/strings.xml) Also, add Google Play translation for: * Title From a70ecb9e9b54bc71cb047582ea2c3ec827afb761 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sun, 26 Feb 2017 11:56:16 +0300 Subject: [PATCH 2/3] better encoding --- app/build.gradle | 2 +- .../activities/RecordingActivity.java | 19 +++++++++++++------ .../services/RecordingService.java | 15 +++++++++++++-- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a73f758..7525fe8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,5 +45,5 @@ dependencies { testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:25.2.0' compile 'com.android.support:support-v4:25.2.0' - compile 'com.github.axet:android-audio-library:0.0.2' // compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:0.0.3' // compile project(':android-audio-library') } 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 36e9653..bf12971 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 @@ -36,8 +36,6 @@ import android.widget.Toast; import com.github.axet.androidlibrary.animations.MarginBottomAnimation; import com.github.axet.androidlibrary.app.MainLibrary; -import com.github.axet.audiorecorder.R; -import com.github.axet.audiorecorder.app.MainApplication; import com.github.axet.audiolibrary.app.RawSamples; import com.github.axet.audiolibrary.app.Sound; import com.github.axet.audiolibrary.app.Storage; @@ -45,8 +43,10 @@ import com.github.axet.audiolibrary.encoders.Encoder; import com.github.axet.audiolibrary.encoders.EncoderInfo; import com.github.axet.audiolibrary.encoders.Factory; import com.github.axet.audiolibrary.encoders.FileEncoder; -import com.github.axet.audiorecorder.services.RecordingService; import com.github.axet.audiolibrary.widgets.PitchView; +import com.github.axet.audiorecorder.R; +import com.github.axet.audiorecorder.app.MainApplication; +import com.github.axet.audiorecorder.services.RecordingService; import java.io.File; @@ -323,7 +323,7 @@ public class RecordingActivity extends AppCompatActivity { boolean recording = thread != null; - RecordingService.startService(this, targetFile.getName(), recording); + RecordingService.startService(this, targetFile.getName(), recording, encoder != null); if (recording) { pitch.record(); @@ -348,7 +348,7 @@ public class RecordingActivity extends AppCompatActivity { stopRecording(); - RecordingService.startService(this, targetFile.getName(), thread != null); + RecordingService.startService(this, targetFile.getName(), thread != null, encoder != null); pitch.setOnTouchListener(new View.OnTouchListener() { @Override @@ -553,6 +553,11 @@ public class RecordingActivity extends AppCompatActivity { tm.listen(pscl, PhoneStateListener.LISTEN_NONE); pscl = null; } + + if (encoder != null) { + encoder.close(); + encoder = null; + } } void startRecording() { @@ -686,7 +691,7 @@ public class RecordingActivity extends AppCompatActivity { }, "RecordingThread"); thread.start(); - RecordingService.startService(this, targetFile.getName(), thread != null); + RecordingService.startService(this, targetFile.getName(), thread != null, encoder != null); } // calcuale buffer length dynamically, this way we can reduce thread cycles when activity in background @@ -790,6 +795,8 @@ public class RecordingActivity extends AppCompatActivity { encoder = new FileEncoder(this, in, e); + RecordingService.startService(this, targetFile.getName(), thread != null, encoder != null); + final ProgressDialog d = new ProgressDialog(this); d.setTitle(getString(R.string.encoding_title)); d.setMessage(".../" + targetFile.getName()); diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java index 46f7ad2..c18f8ea 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java @@ -12,6 +12,7 @@ import android.os.IBinder; import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; import android.util.Log; +import android.view.View; import android.widget.RemoteViews; import com.github.axet.audiorecorder.R; @@ -38,6 +39,7 @@ public class RecordingService extends Service { String targetFile; boolean recording; + boolean encoding; public class RecordingReceiver extends BroadcastReceiver { @Override @@ -51,10 +53,12 @@ public class RecordingService extends Service { } } - public static void startService(Context context, String targetFile, boolean recording) { + public static void startService(Context context, String targetFile, boolean recording, boolean encoding) { context.startService(new Intent(context, RecordingService.class) .putExtra("targetFile", targetFile) - .putExtra("recording", recording)); + .putExtra("recording", recording) + .putExtra("encoding", encoding) + ); } public static void stopService(Context context) { @@ -85,6 +89,7 @@ public class RecordingService extends Service { if (a == null) { targetFile = intent.getStringExtra("targetFile"); recording = intent.getBooleanExtra("recording", false); + encoding = intent.getBooleanExtra("encoding", false); showNotificationAlarm(true); } else if (a.equals(PAUSE_BUTTON)) { Intent i = new Intent(RecordingActivity.PAUSE_BUTTON); @@ -141,7 +146,13 @@ public class RecordingService extends Service { String title = getString(R.string.recording_title); String text = ".../" + targetFile; + if (encoding) { + view.setViewVisibility(R.id.notification_pause, View.GONE); + title = getString(R.string.encoding_title); + } + view.setOnClickPendingIntent(R.id.status_bar_latest_event_content, main); + view.setTextViewText(R.id.notification_title, title); view.setTextViewText(R.id.notification_text, text); view.setOnClickPendingIntent(R.id.notification_pause, pe); view.setImageViewResource(R.id.notification_pause, !recording ? R.drawable.ic_play_arrow_black_24dp : R.drawable.ic_pause_black_24dp); From 4d6f90d66a7af405986935128f25991262086bb6 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sun, 26 Feb 2017 11:56:23 +0300 Subject: [PATCH 3/3] Bump version audiorecorder-1.4.5 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7525fe8..75fe5a3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 23 - versionCode 106 - versionName "1.4.4" + versionCode 107 + versionName "1.4.5" } signingConfigs { release {