Merge branch 'audiorecorder-3.2.5'

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.github.axet.audiorecorder"
         minSdkVersion 9
         targetSdkVersion 23 // 24+ file:// unable to open
-        versionCode 261
-        versionName "3.2.4"
+        versionCode 262
+        versionName "3.2.5"
     }
     signingConfigs {
         release {
@@ -42,17 +42,20 @@ android {
             output.outputFileName = org.apache.commons.io.FilenameUtils.getExtension(android.defaultConfig.applicationId) + "-" + abi + "-" + android.defaultConfig.versionName + "-" + variant.buildType.name + ".apk"
         }
     }
-    splits {
+    bundle {
+        language {
+            enableSplit = false
+        }
+        density {
+            enableSplit = true
+        }
         abi {
-            enable true
-            reset()
-            include "x86", "x86_64", "armeabi-v7a", "arm64-v8a", "mips", "mips64"
-            universalApk true
+            enableSplit = true
         }
     }
 }
 
 dependencies {
     testImplementation 'junit:junit:4.12'
-    implementation 'com.github.axet:android-audio-library:1.0.99' // implementation project(':android-audio-library')
+    implementation 'com.github.axet:android-audio-library:1.0.102' // implementation project(':android-audio-library')
 }

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

@@ -22,6 +22,7 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.SwitchPreferenceCompat;
 import android.view.MenuItem;
 import android.widget.ProgressBar;
 import android.widget.SeekBar;
@@ -60,9 +61,12 @@ import java.util.List;
 public class SettingsActivity extends AppCompatSettingsThemeActivity implements PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback {
 
     public static final int RESULT_STORAGE = 1;
+    public static final int RESULT_CALL = 2;
 
     Handler handler = new Handler();
 
+    public static String[] PREMS = new String[]{Manifest.permission.READ_PHONE_STATE};
+
     public static <T> T[] removeElement(Class<T> c, T[] aa, int i) {
         List<T> ll = Arrays.asList(aa);
         ll = new ArrayList<>(ll);
@@ -273,6 +277,19 @@ public class SettingsActivity extends AppCompatSettingsThemeActivity implements
                 bluetooth.setVisible(false);
             }
             bindPreferenceSummaryToValue(bluetooth);
+
+            Preference p = pm.findPreference(MainApplication.PREFERENCE_CALL);
+            p.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    boolean b = (boolean) newValue;
+                    if (b) {
+                        if (!Storage.permitted(GeneralPreferenceFragment.this, PREMS, RESULT_CALL))
+                            return false;
+                    }
+                    return true;
+                }
+            });
         }
 
         @Override
@@ -295,22 +312,25 @@ public class SettingsActivity extends AppCompatSettingsThemeActivity implements
         @Override
         public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
             super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-
             StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) findPreference(MainApplication.PREFERENCE_STORAGE);
-
             switch (requestCode) {
                 case RESULT_STORAGE:
                     s.onRequestPermissionsResult(permissions, grantResults);
                     break;
+                case RESULT_CALL:
+                    SwitchPreferenceCompat p = (SwitchPreferenceCompat) findPreference(MainApplication.PREFERENCE_CALL);
+                    if (!Storage.permitted(getContext(), PREMS))
+                        p.setChecked(false);
+                    else
+                        p.setChecked(true);
+                    break;
             }
         }
 
         @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
             super.onActivityResult(requestCode, resultCode, data);
-
             StoragePathPreferenceCompat s = (StoragePathPreferenceCompat) findPreference(MainApplication.PREFERENCE_STORAGE);
-
             switch (requestCode) {
                 case RESULT_STORAGE:
                     s.onActivityResult(resultCode, data);

app/src/main/res/values-sk/strings.xml

@@ -12,13 +12,13 @@
     </string-array>
 
     <string-array name="source_text">
-        <item>Mic</item>
+        <item>Mikrofón</item>
         <item>Bluetooth</item>
     </string-array>
 
     <string-array name="themes_text">
-        <item>Theme Svetlá</item>
-        <item>Theme Tmavá</item>
+        <item>Svetlý vzhľad</item>
+        <item>Tmavý vzhľad</item>
     </string-array>
 
     <string-array name="channels_text">
@@ -37,7 +37,9 @@
     <string name="pause_title">Pozastavené...</string>
     <string name="recording_title">Nahrávanie</string>
     <string name="open_recording_folder">Otvoriť priečinok s nahrávkami</string>
-    <string name="recording_list_is_empty">Zoznam nahrávok je prázdny\n\nZačnite klepnutím na tlačidlo Nahrávať</string>
+    <string name="recording_list_is_empty">Zoznam nahrávok je prázdny\n
+   \n
+   Začnite klepnutím na tlačidlo Nahrávať</string>
     <string name="record_button">Nahrávať</string>
     <string name="cut_button">Odstrihnúť</string>
     <string name="stop_button">Zastaviť</string>
@@ -57,13 +59,13 @@
     <string name="pref_silence_summary">Prepnúť zariadenie do tichého režimu počas nahrávania</string>
     <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_application">Application</string>
-    <string name="pref_recordings">Recordings</string>
-    <string name="pref_fly_title">Encoding on Fly</string>
-    <string name="pref_fly_summary">Encoding on fly disable editing, and crash recovery</string>
-    <string name="hold_by_bluetooth">pause (bluetooth disconnected)</string>
-    <string name="menu_search">Search</string>
-    <string name="save_as_wav">Save as WAV</string>
+    <string name="pref_theme_title">Vzhľad</string>
+    <string name="pref_theme_summary">Farebný vzhľad aplikácie (svetlý / tmavý)</string>
+    <string name="pref_application">Aplikácia</string>
+    <string name="pref_recordings">Nahrávky</string>
+    <string name="pref_fly_title">Kódovať v reálnom čase</string>
+    <string name="pref_fly_summary">Neumožňuje úpravy a obnovenie nahrávky po páde</string>
+    <string name="hold_by_bluetooth">Pozastavené (odpojené bluetooth)</string>
+    <string name="menu_search">Hľadať</string>
+    <string name="save_as_wav">Uložiť vo formáte WAV</string>
 </resources>

build.gradle

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