diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e490927..516f560 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,15 +23,18 @@ android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" - android:theme="@style/Translucent"> - + android:theme="@android:style/Theme.Translucent.NoTitleBar"> + + android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"> @@ -39,14 +42,15 @@ + android:label="@string/app_name" + android:theme="@android:style/Theme.Translucent.NoTitleBar" /> + android:theme="@android:style/Theme.Translucent.NoTitleBar"> @@ -62,7 +66,8 @@ android:configChanges="orientation|keyboardHidden|screenSize" android:exported="true" android:launchMode="singleInstance" - android:showOnLockScreen="true"> + android:showOnLockScreen="true" + android:theme="@android:style/Theme.Translucent.NoTitleBar"> @@ -79,14 +84,18 @@ - + - + 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 82e0b10..8b4f981 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 @@ -399,7 +399,7 @@ public class MainActivity extends AppCompatThemeActivity { @Override public int getAppTheme() { - return AudioApplication.getTheme(this, R.style.RecThemeLight_NoActionBar, R.style.RecThemeDark_NoActionBar); + return AudioApplication.getTheme(this, R.style.RecThemeLight_NoActionBar, R.style.RecThemeDark_NoActionBar, R.style.RecThemeDarkBlack_NoActionBar); } @Override 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 518aff3..d8439aa 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 @@ -370,7 +370,7 @@ public class RecordingActivity extends AppCompatThemeActivity { @Override public int getAppTheme() { - return AudioApplication.getTheme(this, R.style.RecThemeLight, R.style.RecThemeDark); + return AudioApplication.getTheme(this, R.style.RecThemeLight, R.style.RecThemeDark, R.style.RecThemeDarkBlack); } @Override 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 9616ae7..b0c83bb 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 @@ -60,7 +60,7 @@ public class SettingsActivity extends AppCompatSettingsThemeActivity implements @Override public int getAppTheme() { - return AudioApplication.getTheme(this, R.style.RecThemeLight, R.style.RecThemeDark); + return AudioApplication.getTheme(this, R.style.RecThemeLight, R.style.RecThemeDark, R.style.RecThemeDarkBlack); } @Override diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/RecordingStorage.java b/app/src/main/java/com/github/axet/audiorecorder/app/RecordingStorage.java index db10e9c..9270ed5 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/RecordingStorage.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/RecordingStorage.java @@ -1,6 +1,5 @@ package com.github.axet.audiorecorder.app; -import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; import android.media.AudioFormat; @@ -18,20 +17,8 @@ import com.github.axet.audiolibrary.app.Sound; import com.github.axet.audiolibrary.encoders.Encoder; import com.github.axet.audiolibrary.encoders.OnFlyEncoding; import com.github.axet.audiorecorder.BuildConfig; -import com.github.axet.audiorecorder.R; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; -import org.json.JSONException; - -import java.io.File; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ShortBuffer; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Locale; import java.util.concurrent.atomic.AtomicBoolean; public class RecordingStorage { @@ -78,7 +65,7 @@ public class RecordingStorage { info = new RawSamples.Info(format, sampleRate, Sound.getChannels(context)); } - public void startRecording(int source) { + public void startRecording(final int source) { final SharedPreferences shared = android.preference.PreferenceManager.getDefaultSharedPreferences(context); sound.silent(); @@ -240,17 +227,20 @@ public class RecordingStorage { } session += samples; - if (samplesTime - silence > 2 * sampleRate) { // 2 second of mic muted - if (!silenceDetected) { - silenceDetected = true; - Post(MUTED, null); - } - } else { - if (silenceDetected) { - silenceDetected = false; - Post(UNMUTED, null); + if (source != Sound.SOURCE_INTERNAL_AUDIO) { + if (samplesTime - silence > 2 * sampleRate) { // 2 second of mic muted + if (!silenceDetected) { + silenceDetected = true; + Post(MUTED, null); + } + } else { + if (silenceDetected) { + silenceDetected = false; + Post(UNMUTED, null); + } } } + diff = (now - start) * sampleRate / 1000; // number of samples we expect by this moment if (diff - session > 2 * sampleRate) { // 2 second of silence / paused by os Post(PAUSED, null); diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 657e03b..8320de5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,20 +6,31 @@ #b1b1b1 + + - - + + + +