diff --git a/app/build.gradle b/app/build.gradle index 8a5b592..98c921e 100644 --- a/app/build.gradle +++ b/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') } 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 1129e9a..a970b8a 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 @@ -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[] removeElement(Class c, T[] aa, int i) { List 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); diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index f8278f7..8cd5fe2 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -12,13 +12,13 @@ - Mic + Mikrofón Bluetooth - Theme Svetlá - Theme Tmavá + Svetlý vzhľad + Tmavý vzhľad @@ -37,7 +37,9 @@ Pozastavené... Nahrávanie Otvoriť priečinok s nahrávkami - Zoznam nahrávok je prázdny\n\nZačnite klepnutím na tlačidlo Nahrávať + Zoznam nahrávok je prázdny\n + \n + Začnite klepnutím na tlačidlo Nahrávať Nahrávať Odstrihnúť Zastaviť @@ -57,13 +59,13 @@ 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á) - Application - Recordings - Encoding on Fly - Encoding on fly disable editing, and crash recovery - pause (bluetooth disconnected) - Search - Save as WAV + Vzhľad + Farebný vzhľad aplikácie (svetlý / tmavý) + Aplikácia + Nahrávky + Kódovať v reálnom čase + Neumožňuje úpravy a obnovenie nahrávky po páde + Pozastavené (odpojené bluetooth) + Hľadať + Uložiť vo formáte WAV diff --git a/build.gradle b/build.gradle index ee6e1ca..36c67b3 100644 --- a/build.gradle +++ b/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' } }