bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'audiorecorder-3.0.56'

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-11-27 16:43:02 +03:00
commit 00e4f8de2d
16 changed files with 28 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -10,8 +10,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23 // 24+ file:// unable to open
versionCode 221
versionName "3.0.55"
versionCode 222
versionName "3.0.56"
}
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.62' // compile project(':android-audio-library')
compile 'com.github.axet:android-audio-library:1.0.65' // compile project(':android-audio-library')
}

4
app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
View file

@ -223,8 +223,8 @@ public class MainActivity extends AppCompatActivity {
int getLastRecording(String last) {
final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
for (int i = 0; i < recordings.getCount(); i++) {
Uri f = recordings.getItem(i);
if (Storage.getDocumentName(f).equals(last)) {
Storage.RecordingUri f = recordings.getItem(i);
if (f.name.equals(last)) {
SharedPreferences.Editor edit = shared.edit();
edit.putString(MainApplication.PREFERENCE_LAST, "");
edit.commit();

17
app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java
View file

@ -54,6 +54,8 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
public static final String[] PERMISSIONS = new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
public static final int RESULT_STORAGE = 1;
Handler handler = new Handler();
public static <T> T[] removeElement(Class<T> c, T[] aa, int i) {
@ -244,11 +246,12 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
bindPreferenceSummaryToValue(pm.findPreference(MainApplication.PREFERENCE_THEME));
bindPreferenceSummaryToValue(pm.findPreference(MainApplication.PREFERENCE_CHANNELS));
bindPreferenceSummaryToValue(pm.findPreference(MainApplication.PREFERENCE_FORMAT));
StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) pm.findPreference(MainApplication.PREFERENCE_STORAGE);
s.setStorage(new Storage(getContext()));
s.setPermissionsDialog(this, PERMISSIONS, 1);
s.setPermissionsDialog(this, PERMISSIONS, RESULT_STORAGE);
if (Build.VERSION.SDK_INT >= 21)
s.setStorageAccessFramework(this, 2);
s.setStorageAccessFramework(this, RESULT_STORAGE);
}
@Override
@ -275,12 +278,8 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) findPreference(MainApplication.PREFERENCE_STORAGE);
switch (requestCode) {
case 1:
if (Storage.permitted(getContext(), permissions))
;
else
Toast.makeText(getContext(), R.string.not_permitted, Toast.LENGTH_SHORT).show();
s.onRequestPermissionsResult();
case RESULT_STORAGE:
s.onRequestPermissionsResult(permissions, grantResults);
break;
}
}
@ -292,7 +291,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) findPreference(MainApplication.PREFERENCE_STORAGE);
switch (requestCode) {
case 2:
case RESULT_STORAGE:
s.onActivityResult(resultCode, data);
break;
}

2
app/src/main/res/raw-fr/about.html
View file

@ -15,7 +15,7 @@
<p>Enregistreur Audio avec dossier d'enregistrement personnalisé, Indicateur de volume d'enregistrement agréable, notification d'enregistrement et avec écran vérouillé.</p>
<dl>
<dt><b>Lincense:</b></dt>
<dt><b>License:</b></dt>
<dd>GPLv3</dd>
<dt><b>Code Source:</b></dt>
<dd><a href="https://gitlab.com/axet/android-audio-recorder">https://gitlab.com/axet/android-audio-recorder</a>

5
app/src/main/res/raw/about.html
View file

@ -15,11 +15,10 @@
<p>Audio Recorder with custom recording folder, nice recording volume indicator, recording notification, recording lock screen activity.</p>
<dl>
<dt><b>Lincense:</b></dt>
<dt><b>License:</b></dt>
<dd>GPLv3</dd>
<dt><b>Source Code:</b></dt>
<dd><a href="https://gitlab.com/axet/android-audio-recorder">https://gitlab.com/axet/android-audio-recorder</a>
</dd>
<dd><a href="https://gitlab.com/axet/android-audio-recorder">https://gitlab.com/axet/android-audio-recorder</a></dd>
</dl>
</body>
</html>

3
app/src/main/res/values-de/strings.xml
View file

@ -21,7 +21,6 @@
<item>Stereo</item>
</string-array>
<string name="not_permitted">Nicht erlaubt</string>
<string name="no_folder_app">Keine App zur Anzeige von Ordnern installiert</string>
<string name="hold_by_call">pausieren (bei Anruf)</string>
<string name="recording_status_recording">aufnehmen</string>
@ -54,5 +53,5 @@
<string name="pref_lockscreen_title">Steuerelemente im Sperrbildschirm</string>
<string name="pref_lockscreen_summary">Zeige Steuerelemente im Sperrbildschirm an</string>
<string name="pref_theme_title">App-Theme</string>
<string name="pref_theme.summary">Wähle App-Theme (dunkel / hell)</string>
<string name="pref_theme_summary">Wähle App-Theme (dunkel / hell)</string>
</resources>

3
app/src/main/res/values-fr/strings.xml
View file

@ -21,7 +21,6 @@
<item>Stéréo</item>
</string-array>
<string name="not_permitted">Non autorisé</string>
<string name="no_folder_app">Aucune application installé pour visionner le dossier</string>
<string name="hold_by_call">pause (hold by call)</string>
<string name="recording_status_recording">enregistrement</string>
@ -54,5 +53,5 @@
<string name="pref_lockscreen_title">Contrôles écran éteint</string>
<string name="pref_lockscreen_summary">Montrez les contrôles quand le téléphone est vérrouillé</string>
<string name="pref_theme_title">Application du Theme</string>
<string name="pref_theme.summary">Appliquer le théme (Sombre | Blanc)</string>
<string name="pref_theme_summary">Appliquer le théme (Sombre | Blanc)</string>
</resources>

3
app/src/main/res/values-it/strings.xml
View file

@ -21,7 +21,6 @@
<item>Stereo</item>
</string-array>
<string name="not_permitted">Non permesso</string>
<string name="no_folder_app">Nessuna app per la visione delle cartelle risulta installa</string>
<string name="hold_by_call">pausa (per chiamata)</string>
<string name="recording_status_recording">registrando</string>
@ -54,5 +53,5 @@
<string name="pref_lockscreen_title">Controlli su schermo bloccato</string>
<string name="pref_lockscreen_summary">Mostra i controlli quando il cellulare è bloccato</string>
<string name="pref_theme_title">Tema applicazione</string>
<string name="pref_theme.summary">Imposta il tema dell'applicazione (scuro / chiaro)</string>
<string name="pref_theme_summary">Imposta il tema dell'applicazione (scuro / chiaro)</string>
</resources>

3
app/src/main/res/values-ja/strings.xml
View file

@ -21,7 +21,6 @@
<item>ステレオ</item>
</string-array>
<string name="not_permitted">許可されていません</string>
<string name="no_folder_app">フォルダーを表示するアプリケーションがインストールされていません</string>
<string name="hold_by_call">一時停止 (着信により保留)</string>
<string name="recording_status_recording">録音中</string>
@ -54,5 +53,5 @@
<string name="pref_lockscreen_title">ロック画面コントロール</string>
<string name="pref_lockscreen_summary">電話がロックされた時にコントロールを表示します</string>
<string name="pref_theme_title">アプリケーションのテーマ</string>
<string name="pref_theme.summary">アプリケーションのテーマを設定します (ダーク / ライト)</string>
<string name="pref_theme_summary">アプリケーションのテーマを設定します (ダーク / ライト)</string>
</resources>

3
app/src/main/res/values-pt-rBR/strings.xml
View file

@ -21,7 +21,6 @@
<item>Estéreo</item>
</string-array>
<string name="not_permitted">Não permitido</string>
<string name="no_folder_app">Não foi encontrado um aplicativo para explorar arquivos</string>
<string name="hold_by_call">pausado (chamada atendida)</string>
<string name="recording_status_recording">gravando</string>
@ -54,5 +53,5 @@
<string name="pref_lockscreen_title">Controle da tela bloqueada</string>
<string name="pref_lockscreen_summary">Mostrar controles quando a tela estiver bloqueada</string>
<string name="pref_theme_title">Tema do app</string>
<string name="pref_theme.summary">Definir o tema (claro ou escuro)</string>
<string name="pref_theme_summary">Definir o tema (claro ou escuro)</string>
</resources>

3
app/src/main/res/values-ru/strings.xml
View file

@ -21,7 +21,6 @@
<item>Стерео</item>
</string-array>
<string name="not_permitted">Доступ запрещен</string>
<string name="no_folder_app">Программа для просмотра папок не установлена</string>
<string name="hold_by_call">пауза (звонок)</string>
<string name="recording_status_recording">запись</string>
@ -54,5 +53,5 @@
<string name="pref_lockscreen_title">Панель управления</string>
<string name="pref_lockscreen_summary">Показывать панель управления когда телефон заблокирован</string>
<string name="pref_theme_title">Тема приложения</string>
<string name="pref_theme.summary">Установить тему приложения (темная / светлая)</string>
<string name="pref_theme_summary">Установить тему приложения (темная / светлая)</string>
</resources>

3
app/src/main/res/values-sk/strings.xml
View file

@ -21,7 +21,6 @@
<item>Stereo</item>
</string-array>
<string name="not_permitted">Nepovolené</string>
<string name="no_folder_app">Nie je nainštalovaná žiadna aplikácia na zobrazenie obsahu priečinka</string>
<string name="hold_by_call">pozastavené (automaticky počas hovoru)</string>
<string name="recording_status_recording">nahrávanie</string>
@ -54,5 +53,5 @@
<string name="pref_lockscreen_title">Tlačidlá na uzamikacej obrazovke</string>
<string name="pref_lockscreen_summary">Zobraziť ovládacie prvky na zamikacej obrazovke</string>
<string name="pref_theme_title">Téma</string>
<string name="pref_theme.summary">Farebná téma aplikácie (svetlá / tmavá)</string>
<string name="pref_theme_summary">Farebná téma aplikácie (svetlá / tmavá)</string>
</resources>

3
app/src/main/res/values/strings.xml
View file

@ -53,7 +53,6 @@
<item>%I</item>
</string-array>
<string name="not_permitted">Not permitted</string>
<string name="no_folder_app">No folder view application installed</string>
<string name="hold_by_call">pause (hold by call)</string>
<string name="recording_status_recording">recording</string>
@ -86,5 +85,5 @@
<string name="pref_lockscreen_title">Lockscreen Controls</string>
<string name="pref_lockscreen_summary">Show controls when phone is locked</string>
<string name="pref_theme_title">Application Theme</string>
<string name="pref_theme.summary">Set application theme (dark / light)</string>
<string name="pref_theme_summary">Set application theme (dark / light)</string>
</resources>

2
app/src/main/res/xml/pref_general.xml
View file

@ -71,7 +71,7 @@
android:key="theme"
android:negativeButtonText="@null"
android:positiveButtonText="@null"
android:summary="@string/pref_theme.summary"
android:summary="@string/pref_theme_summary"
android:title="@string/pref_theme_title" />
</PreferenceScreen>

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.0.1'
}
}

4
docs/HOWTO-Translate.md
View file

@ -13,7 +13,7 @@ Additional file from 'android-audio-library'
Also, add Google Play translation for:
* Title (50 symbols max)
* Short Description (80 symbols max)
* Short description (80 symbols max)
* Full description (4000 symbols max)
Then add those files to the repository using "New Issue" or "Merge Request" (GitLab's name for "Pull Request" if you come from GitHub) against the `dev` branch.
Then add those files to the repository using "New Issue" or "Merge Request" against the `dev` branch.