diff --git a/app/build.gradle b/app/build.gradle index 315a769..f2dec2a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,14 +4,14 @@ import com.android.build.OutputFile android { compileSdkVersion 25 - buildToolsVersion "26.0.2" + buildToolsVersion "27.0.1" defaultConfig { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 23 // 24+ file:// unable to open - versionCode 219 - versionName "3.0.53" + versionCode 220 + versionName "3.0.54" } signingConfigs { release { @@ -55,5 +55,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.github.axet:android-audio-library:1.0.55' // compile project(':android-audio-library') + compile 'com.github.axet:android-audio-library:1.0.56' // 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 b8ae3e3..d897f3f 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 @@ -515,6 +515,8 @@ public class RecordingActivity extends AppCompatActivity { if (r != buf.len) throw new RuntimeException("unable to read data"); int last = buf.len / buf.getChannels() - 1; + if (play != null) + play.release(); play = AudioTrack.create(Sound.SOUND_STREAM, Sound.SOUND_CHANNEL, Sound.SOUND_TYPE, buf); play.setNotificationMarkerPosition(last); play.setPositionNotificationPeriod(playUpdate); @@ -603,6 +605,11 @@ public class RecordingActivity extends AppCompatActivity { pscl = null; } + if (play != null) { + play.release(); + play = null; + } + if (encoder != null) { encoder.close(); encoder = null; diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java index 36982f6..c2aa307 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java @@ -246,10 +246,9 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere bindPreferenceSummaryToValue(pm.findPreference(MainApplication.PREFERENCE_FORMAT)); StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) pm.findPreference(MainApplication.PREFERENCE_STORAGE); s.setStorage(new Storage(getContext())); + s.setPermissionsDialog(this, PERMISSIONS, 1); if (Build.VERSION.SDK_INT >= 21) s.setStorageAccessFramework(this, 2); - else - s.setPermissionsDialog(this, PERMISSIONS, 1); } @Override diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3f5309f..7173490 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -39,4 +39,20 @@ Stop Abbruch Pause + + Speicherpfad + Abtastrate + Encoding + Ausgabedateiformate (.wav, .m4a, ...) + Mono/Stereo + Aufnahmekanäle + Format für Name + Pausieren während Telefonaten + Stoppe Aufnahme bei Anrufannahme und setze nach Auflegen fort + Ruhe-Modus + Aktiviere Audio-Profil \'Nicht Stören\' während Aufnahmen + Steuerelemente im Sperrbildschirm + Zeige Steuerelemente im Sperrbildschirm an + App-Theme + Wähle App-Theme (dunkel / hell) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c66e26d..9368a33 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -39,4 +39,20 @@ Stopper Annuler Pause + + Dossier de stockage + Taux d\'échantillonnage + Encodage + Formats de sortie (.wav, .m4a, ...) + Mode + Canaux d\'enregistrements + Format de nommage + Mettre en pause durant les appels + Arrêtez l\'enregistrement lorsque vous répondez à un appel et se poursuit lorsque vous posez + Mode Silence + Mettre le téléphone en mode silencieux pendant l\'enregistrement + Contrôles écran éteint + Montrez les contrôles quand le téléphone est vérrouillé + Application du Theme + Appliquer le théme (Sombre | Blanc) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dbe548f..190c429 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -39,4 +39,20 @@ Stop Cancel Pause + + Salva file in ... + Frequenza di campionamento + Codifica + Formato del file prodotto (.wav, .m4a, ...) + Canali + Numero di canali per la registrazione + Formato per il nome + Pausa durante le chiamate + Ferma la registrazione quando rispondi a chiamate e continua quando metti giù + Silenzioso + Metti in cellulare in \'silenzioso\' durante le registrazioni + Controlli su schermo bloccato + Mostra i controlli quando il cellulare è bloccato + Tema applicazione + Imposta il tema dell'applicazione (scuro / chiaro) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c9e69bd..6af902f 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -39,4 +39,20 @@ Stop Cancel Pause + + ストレージのパス + サンプルレート + エンコーディング + 出力ファイル形式 (.wav, .m4a, ...) + モード + 録音チャンネル + 名前の書式 + 着信時に一時停止 + 着信して通話をする間、録音を停止します + マナーモード + 録音中、電話を \'マナーモード\' にします + ロック画面コントロール + 電話がロックされた時にコントロールを表示します + アプリケーションのテーマ + アプリケーションのテーマを設定します (ダーク / ライト) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7c1070f..8690b5d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -39,4 +39,20 @@ Stop Cancel Pause + + Destino das gravações + Taxa de amostragem + Codificação + Formato de saída do arquivo (.wav, .mp3, etc.) + Modo + Canais a gravar + Formato do nome de arquivo + Pausar durante chamadas + e voltar a gravar quando a chamada for desligada + Modo silencioso + Silenciar o aparelho durante a gravação + Controle da tela bloqueada + Mostrar controles quando a tela estiver bloqueada + Tema do app + Definir o tema (claro ou escuro) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7a116ef..7eedbc0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -39,4 +39,20 @@ Стоп Отмена Пауза + + Папка для хранения + Частота записи + Кодировка + Формат выходного файла (.wav, .m4a, ...) + Режим + Режим записи + Имя нового файла + Пауза на время разговора + Останавливать запись на время разговора по телефону + Режим тишины + Включать беззвучный режим на время записи + Панель управления + Показывать панель управления когда телефон заблокирован + Тема приложения + Установить тему приложения (темная / светлая) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 3e1b7bf..2496504 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -39,4 +39,20 @@ Zastaviť Zrušiť Pozastaviť + + Priečinok s nahrávkami + Vzorkovacia frekvencia + Kódovanie + Výstupný zvukový formát (.wav, .m4a, ...) + Režim + Zvukové kanály + Formát názvu súboru + Pozastaviť počas hovoru + Zastaví nahrávanie po prijatí hovoru a po jeho ukončení bude nahrávanie pokračovať + Tichý režim + Prepnúť zariadenie do tichého režimu počas nahrávania + Tlačidlá na uzamikacej obrazovke + Zobraziť ovládacie prvky na zamikacej obrazovke + Téma + Farebná téma aplikácie (svetlá / tmavá) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7070697..23b0c4c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,4 +71,20 @@ Stop Cancel Pause + + Storage Path + Sample Rate + Encoding + Output file formats (.wav, .m4a, ...) + Mode + Recording channels + Name Format + Pause During Calls + Stop recording on answering and continue on hangup + Silence Mode + Put phone in \'silence mode\' during recording + Lockscreen Controls + Show controls when phone is locked + Application Theme + Set application theme (dark / light) diff --git a/app/src/main/res/xml-de/pref_general.xml b/app/src/main/res/xml-de/pref_general.xml deleted file mode 100644 index aaf0e23..0000000 --- a/app/src/main/res/xml-de/pref_general.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/xml-fr/pref_general.xml b/app/src/main/res/xml-fr/pref_general.xml deleted file mode 100644 index 435b46b..0000000 --- a/app/src/main/res/xml-fr/pref_general.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/xml-it/pref_general.xml b/app/src/main/res/xml-it/pref_general.xml deleted file mode 100644 index ceff8c5..0000000 --- a/app/src/main/res/xml-it/pref_general.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/xml-ja/pref_general.xml b/app/src/main/res/xml-ja/pref_general.xml deleted file mode 100644 index 509ffd0..0000000 --- a/app/src/main/res/xml-ja/pref_general.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/xml-pt-rBR/pref_general.xml b/app/src/main/res/xml-pt-rBR/pref_general.xml deleted file mode 100644 index 19797f2..0000000 --- a/app/src/main/res/xml-pt-rBR/pref_general.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/xml-ru/pref_general.xml b/app/src/main/res/xml-ru/pref_general.xml deleted file mode 100644 index 6aa973e..0000000 --- a/app/src/main/res/xml-ru/pref_general.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/xml-sk/pref_general.xml b/app/src/main/res/xml-sk/pref_general.xml deleted file mode 100644 index af12f74..0000000 --- a/app/src/main/res/xml-sk/pref_general.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index 7a97d7d..b75b83d 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -4,7 +4,7 @@ android:defaultValue="Audio Recorder" android:key="storage_path" android:summary="/sdcard/some/" - android:title="Storage Path" /> + android:title="@string/pref_storage_title" /> + android:title="@string/pref_rate_title" /> + android:summary="@string/pref_encoding_summary" + android:title="@string/pref_encoding_title" /> + android:summary="@string/pref_mode_summary" + android:title="@string/pref_mode_title" /> + android:title="@string/pref_nameformat_title" /> + android:summary="@string/pref_pausecalls_summary" + android:title="@string/pref_pausecalls_title" /> + android:summary="@string/pref_silence_summary" + android:title="@string/pref_silence_title" /> + android:summary="@string/pref_lockscreen_summary" + android:title="@string/pref_lockscreen_title" /> + android:summary="@string/pref_theme.summary" + android:title="@string/pref_theme_title" /> diff --git a/docs/HOWTO-Translate.md b/docs/HOWTO-Translate.md index 1a4cd8b..fa187d2 100644 --- a/docs/HOWTO-Translate.md +++ b/docs/HOWTO-Translate.md @@ -2,7 +2,6 @@ To translate 'Audio Recorder' to your language you need to translate following files: - * [pref_general.xml](/app/src/main/res/xml/pref_general.xml) * [strings.xml](/app/src/main/res/values/strings.xml) * [about.html](/app/src/main/res/raw/about.html)