diff --git a/app/build.gradle b/app/build.gradle index 457d03c..5a1d68e 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 272 - versionName "3.2.14" + versionCode 273 + versionName "3.2.15" } signingConfigs { release { @@ -57,5 +57,5 @@ android { dependencies { testImplementation 'junit:junit:4.12' - implementation 'com.github.axet:android-audio-library:1.0.111' // implementation project(':android-audio-library') + implementation 'com.github.axet:android-audio-library:1.0.113' // implementation project(':android-audio-library') } diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java index 286c72d..fc5a030 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java @@ -130,9 +130,9 @@ public class MainActivity extends AppCompatThemeActivity { getMenuInflater().inflate(R.menu.menu_main, menu); MenuItem item = menu.findItem(R.id.action_show_folder); - Intent intent = StorageProvider.openFolderIntent(this, storage.getStoragePath()); + Intent intent = StorageProvider.getProvider().openFolderIntent(this, storage.getStoragePath()); item.setIntent(intent); - if (!StorageProvider.isFolderCallable(this, intent, StorageProvider.getAuthority())) { + if (!StorageProvider.isFolderCallable(this, intent, StorageProvider.getProvider().getAuthority())) { item.setVisible(false); } 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 927637a..9f5912c 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 @@ -132,7 +132,6 @@ public class RecordingActivity extends AppCompatThemeActivity { } class RecordingReceiver extends BluetoothReceiver { - @Override public void onConnected() { if (thread == null) { @@ -210,8 +209,6 @@ public class RecordingActivity extends AppCompatThemeActivity { setContentView(R.layout.activity_recording); - setupActionBar(); - pitch = (PitchView) findViewById(R.id.recording_pitch); time = (TextView) findViewById(R.id.recording_time); state = (TextView) findViewById(R.id.recording_state); @@ -221,7 +218,7 @@ public class RecordingActivity extends AppCompatThemeActivity { sound = new Sound(this); sampleRate = Sound.getSampleRate(this); - samplesUpdate = (int) (pitch.getPitchTime() * sampleRate / 1000.0); + samplesUpdate = (int) (pitch.getPitchTime() * sampleRate / 1000f); samplesUpdateStereo = samplesUpdate * Sound.getChannels(this); screen = new ScreenReceiver(); @@ -344,13 +341,6 @@ public class RecordingActivity extends AppCompatThemeActivity { } } - private void setupActionBar() { - ActionBar actionBar = getSupportActionBar(); - if (actionBar != null) { -// actionBar.setBackgroundDrawable(new ColorDrawable(MainApplication.getActionbarColor(this))); - } - } - void loadSamples() { File f = storage.getTempRecording(); if (!f.exists()) { 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 a970b8a..e69ad4d 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 @@ -67,6 +67,7 @@ public class SettingsActivity extends AppCompatSettingsThemeActivity implements public static String[] PREMS = new String[]{Manifest.permission.READ_PHONE_STATE}; + @SuppressWarnings("unchecked") public static T[] removeElement(Class c, T[] aa, int i) { List ll = Arrays.asList(aa); ll = new ArrayList<>(ll); diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java b/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java index 127e29a..7e6edc3 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/Storage.java @@ -46,7 +46,7 @@ public class Storage extends com.github.axet.audiolibrary.app.Storage { } return Uri.fromFile(getNextFile(f, format, ext)); } else { - throw new RuntimeException("unknown uri"); + throw new UnknownUri(); } } diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java b/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java index cb34f99..c49d0ac 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/BluetoothReceiver.java @@ -108,6 +108,7 @@ public class BluetoothReceiver extends BroadcastReceiver { public void onStartBluetoothSco() { } + @SuppressWarnings("deprecation") public boolean startBluetooth() { AudioManager am = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); if (am.isBluetoothScoAvailableOffCall()) { diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java index 1febaa7..d74aefc 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java +++ b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java @@ -21,6 +21,7 @@ import android.view.View; import android.widget.RemoteViews; import com.github.axet.androidlibrary.widgets.OptimizationPreferenceCompat; +import com.github.axet.androidlibrary.widgets.ProximityShader; import com.github.axet.audiolibrary.app.Storage; import com.github.axet.audiorecorder.R; import com.github.axet.audiorecorder.activities.MainActivity; @@ -130,6 +131,7 @@ public class RecordingService extends Service { } else if (a.equals(RECORD_BUTTON)) { RecordingActivity.startActivity(this, false); } else if (a.equals(SHOW_ACTIVITY)) { + ProximityShader.closeSystemDialogs(this); if (intent.getStringExtra("targetFile") == null) MainActivity.startActivity(this); else diff --git a/app/src/main/res/raw-pl/about.html b/app/src/main/res/raw-pl/about.html new file mode 100644 index 0000000..acd95e2 --- /dev/null +++ b/app/src/main/res/raw-pl/about.html @@ -0,0 +1,24 @@ + + + + + + + +

O aplikacji

+

+ Przyjazny dla systemu Android! +

+ +

Audio Recorder with custom recording folder, nice recording volume indicator, recording notification, recording lock screen activity.

+ +
+
Licencja:
+
GPLv3
+
Kod Źródłowy:
+
https://gitlab.com/axet/android-audio-recorder
+
+ + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml new file mode 100644 index 0000000..4c1e787 --- /dev/null +++ b/app/src/main/res/values-pl/strings.xml @@ -0,0 +1,67 @@ + + Audio Recorder + + + 48 kHz + 44.1 kHz (CD) + 32 kHz + 22 kHz + 16 kHz (domyślnie) + 11 kHz + 8 kHz (telefon) + + + + Mikrofon + Bluetooth + + + + Motyw Jasny + Motyw Ciemny + + + + Mono (domyślnie) + Stereo + + + pauza (wstrzymane przez połączenie) + nagrywanie + enkodowanie + pauza + edytuj + Potwierdź anulowanie + Enkodowanie... + Pauza... + Nagrywanie + Otwórz Folder Nagrywania + Lista nagrań jest pusta\n\nKliknij Nagraj, aby rozpocząć nagrywanie + Nagrywaj + Wytnij + Stop + Anuluj + Pauza + + Ścieżka Przechowywania + Tempo Próbkowania + Enkodowanie + Wyjściowy format pliku (.wav, .m4a, ...) + Tryb + Format Nazwy + Wstrzymaj podczas połączeń + Zatrzymaj nagrywanie po odebraniu i kontynuuj podcas rozłączania + Tryb Wyciszenia + Przełącz telefon w \'tryb ciszy\' podczas nagrywania + Sterowanie z ekranu blokady + Pokaż elementy sterujące, gdy telefon jest zablokowany + Motyw Aplikacji + Ustaw motyw aplikacji (ciemny / jasny) + Aplikacja + Nagrania + Enkodowanie w Locie + Włączając enkodowanie w locie, wyłącza edytowanie i odzyskiwanie po awarii + pauza (bluetooth rozłaczony) + Szukaj + Zapisz jako WAV +