diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/SettingsActivity.kt index ae108d1..8f5aaa7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/SettingsActivity.kt @@ -1,11 +1,13 @@ package com.simplemobiletools.voicerecorder.activities +import android.media.MediaRecorder import android.os.Bundle import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog import com.simplemobiletools.commons.dialogs.FilePickerDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.NavigationIcon +import com.simplemobiletools.commons.helpers.isNougatPlus import com.simplemobiletools.commons.helpers.isQPlus import com.simplemobiletools.commons.helpers.isTiramisuPlus import com.simplemobiletools.commons.models.RadioItem @@ -39,6 +41,7 @@ class SettingsActivity : SimpleActivity() { setupSaveRecordingsFolder() setupExtension() setupBitrate() + setupAudioSource() setupRecordAfterLaunch() updateTextColors(settings_nested_scrollview) @@ -172,4 +175,36 @@ class SettingsActivity : SimpleActivity() { config.recordAfterLaunch = settings_record_after_launch.isChecked } } + + private fun setupAudioSource() { + settings_audio_source.text = config.getAudioSourceText(config.audioSource) + settings_audio_source_holder.setOnClickListener { + val items = getAudioSources().map { RadioItem(it, config.getAudioSourceText(it)) } as ArrayList + + RadioGroupDialog(this@SettingsActivity, items, config.audioSource) { + config.audioSource = it as Int + settings_audio_source.text = config.getAudioSourceText(config.audioSource) + } + } + } + + private fun getAudioSources(): ArrayList { + val availableSources = arrayListOf( + MediaRecorder.AudioSource.CAMCORDER, + MediaRecorder.AudioSource.DEFAULT, + MediaRecorder.AudioSource.MIC, + MediaRecorder.AudioSource.VOICE_RECOGNITION, + MediaRecorder.AudioSource.VOICE_COMMUNICATION + ) + + if (isNougatPlus()) { + availableSources.add(MediaRecorder.AudioSource.UNPROCESSED) + } + + if (isQPlus()) { + availableSources.add(MediaRecorder.AudioSource.VOICE_PERFORMANCE) + } + + return availableSources + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Config.kt index 63e7f30..8c43862 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Config.kt @@ -23,6 +23,22 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getInt(EXTENSION, EXTENSION_M4A) set(extension) = prefs.edit().putInt(EXTENSION, extension).apply() + var audioSource: Int + get() = prefs.getInt(AUDIO_SOURCE, MediaRecorder.AudioSource.CAMCORDER) + set(audioSource) = prefs.edit().putInt(AUDIO_SOURCE, audioSource).apply() + + fun getAudioSourceText(audio_source: Int) = context.getString( + when (audio_source) { + MediaRecorder.AudioSource.DEFAULT -> R.string.audio_source_default + MediaRecorder.AudioSource.MIC -> R.string.audio_source_microphone + MediaRecorder.AudioSource.VOICE_RECOGNITION -> R.string.audio_source_voice_recognition + MediaRecorder.AudioSource.VOICE_COMMUNICATION -> R.string.audio_source_voice_communication + MediaRecorder.AudioSource.UNPROCESSED -> R.string.audio_source_unprocessed + MediaRecorder.AudioSource.VOICE_PERFORMANCE -> R.string.audio_source_voice_performance + else -> R.string.audio_source_camcorder + } + ) + var bitrate: Int get() = prefs.getInt(BITRATE, DEFAULT_BITRATE) set(bitrate) = prefs.edit().putInt(BITRATE, bitrate).apply() @@ -31,11 +47,13 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(RECORD_AFTER_LAUNCH, false) set(recordAfterLaunch) = prefs.edit().putBoolean(RECORD_AFTER_LAUNCH, recordAfterLaunch).apply() - fun getExtensionText() = context.getString(when (extension) { - EXTENSION_M4A -> R.string.m4a - EXTENSION_OGG -> R.string.ogg - else -> R.string.mp3 - }) + fun getExtensionText() = context.getString( + when (extension) { + EXTENSION_M4A -> R.string.m4a + EXTENSION_OGG -> R.string.ogg + else -> R.string.mp3 + } + ) fun getOutputFormat() = when (extension) { EXTENSION_OGG -> MediaRecorder.OutputFormat.OGG diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Constants.kt index 731d73c..449d479 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Constants.kt @@ -33,6 +33,7 @@ const val TOGGLE_WIDGET_UI = "toggle_widget_ui" const val HIDE_NOTIFICATION = "hide_notification" const val SAVE_RECORDINGS = "save_recordings" const val EXTENSION = "extension" +const val AUDIO_SOURCE = "audio_source" const val BITRATE = "bitrate" const val RECORD_AFTER_LAUNCH = "record_after_launch" diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/recorder/MediaRecorderWrapper.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/recorder/MediaRecorderWrapper.kt index 5c2df45..66c6a7c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/recorder/MediaRecorderWrapper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/recorder/MediaRecorderWrapper.kt @@ -10,7 +10,7 @@ import java.io.FileDescriptor class MediaRecorderWrapper(val context: Context) : Recorder { private var recorder = MediaRecorder().apply { - setAudioSource(MediaRecorder.AudioSource.CAMCORDER) + setAudioSource(context.config.audioSource) setOutputFormat(context.config.getOutputFormat()) setAudioEncoder(context.config.getAudioEncoder()) setAudioEncodingBitRate(context.config.bitrate) diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/recorder/Mp3Recorder.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/recorder/Mp3Recorder.kt index a2c4bcd..81d16cb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/recorder/Mp3Recorder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/recorder/Mp3Recorder.kt @@ -4,7 +4,6 @@ import android.annotation.SuppressLint import android.content.Context import android.media.AudioFormat import android.media.AudioRecord -import android.media.MediaRecorder import com.naman14.androidlame.AndroidLame import com.naman14.androidlame.LameBuilder import com.simplemobiletools.commons.extensions.showErrorToast @@ -33,7 +32,7 @@ class Mp3Recorder(val context: Context) : Recorder { @SuppressLint("MissingPermission") private val audioRecord = AudioRecord( - MediaRecorder.AudioSource.CAMCORDER, + context.config.audioSource, SAMPLE_RATE, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT, diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ba02c79..a282a58 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -235,6 +235,29 @@ + + + + + + + Try hiding the recording notification Save recordings in + Audio source Bitrate Start recording automatically after launching the app Can I hide the notification icon during recording? Well, it depends. While you use your device it is no longer possible to fully hide the notifications of apps like this. If you check the proper setting item, the app will do its best to hide it. You can hide it on the lockscreen though, if you disable the displaying of sensitive notifications in your device settings. + + Camera + Android default + Unprocessed + Microphone + Voice recognition + Voice communication + Voice performance