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

Merge branch 'audiorecorder-3.1.12'

Browse source
This commit is contained in:
Alexey Kuznetsov 2018-01-31 21:34:47 +03:00
commit de4981e526
7 changed files with 14 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

4
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 242
versionName "3.1.11"
versionCode 243
versionName "3.1.12"
}
signingConfigs {
release {

112
app/src/main/java/com/github/axet/audiorecorder/activities/AppCompatPreferenceActivity.java
View file

@ -1,112 +0,0 @@
package com.github.axet.audiorecorder.activities;
import android.content.res.Configuration;
import android.os.Bundle;
import android.preference.PreferenceActivity;
import android.support.annotation.LayoutRes;
import android.support.annotation.Nullable;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatDelegate;
import android.support.v7.widget.Toolbar;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import com.github.axet.audiorecorder.app.MainApplication;
/**
* A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls
* to be used with AppCompat.
*/
public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
private AppCompatDelegate mDelegate;
@Override
protected void onCreate(Bundle savedInstanceState) {
setTheme(((MainApplication) getApplication()).getUserTheme());
getDelegate().installViewFactory();
getDelegate().onCreate(savedInstanceState);
super.onCreate(savedInstanceState);
}
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
getDelegate().onPostCreate(savedInstanceState);
}
public ActionBar getSupportActionBar() {
return getDelegate().getSupportActionBar();
}
public void setSupportActionBar(@Nullable Toolbar toolbar) {
getDelegate().setSupportActionBar(toolbar);
}
@Override
public MenuInflater getMenuInflater() {
return getDelegate().getMenuInflater();
}
@Override
public void setContentView(@LayoutRes int layoutResID) {
getDelegate().setContentView(layoutResID);
}
@Override
public void setContentView(View view) {
getDelegate().setContentView(view);
}
@Override
public void setContentView(View view, ViewGroup.LayoutParams params) {
getDelegate().setContentView(view, params);
}
@Override
public void addContentView(View view, ViewGroup.LayoutParams params) {
getDelegate().addContentView(view, params);
}
@Override
protected void onPostResume() {
super.onPostResume();
getDelegate().onPostResume();
}
@Override
protected void onTitleChanged(CharSequence title, int color) {
super.onTitleChanged(title, color);
getDelegate().setTitle(title);
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
getDelegate().onConfigurationChanged(newConfig);
}
@Override
protected void onStop() {
super.onStop();
getDelegate().onStop();
}
@Override
protected void onDestroy() {
super.onDestroy();
getDelegate().onDestroy();
}
public void invalidateOptionsMenu() {
getDelegate().invalidateOptionsMenu();
}
private AppCompatDelegate getDelegate() {
if (mDelegate == null) {
mDelegate = AppCompatDelegate.create(this, null);
}
return mDelegate;
}
}

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

@ -67,7 +67,7 @@ public class MainActivity extends AppCompatThemeActivity {
@Override
public int getAppTheme() {
return MainApplication.getTheme(this, R.style.AppThemeLight_NoActionBar, R.style.AppThemeDark_NoActionBar);
return MainApplication.getTheme(this, R.style.RecThemeLight_NoActionBar, R.style.RecThemeDark_NoActionBar);
}
@Override

9
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -39,6 +39,7 @@ import android.widget.Toast;
import com.github.axet.androidlibrary.animations.MarginBottomAnimation;
import com.github.axet.androidlibrary.sound.AudioTrack;
import com.github.axet.androidlibrary.widgets.AppCompatThemeActivity;
import com.github.axet.audiolibrary.app.RawSamples;
import com.github.axet.audiolibrary.app.Sound;
import com.github.axet.audiolibrary.encoders.Encoder;
@ -58,7 +59,7 @@ import java.io.File;
import java.nio.ShortBuffer;
import java.util.concurrent.atomic.AtomicBoolean;
public class RecordingActivity extends AppCompatActivity {
public class RecordingActivity extends AppCompatThemeActivity {
public static final String TAG = RecordingActivity.class.getSimpleName();
public static final int RESULT_START = 1;
@ -193,9 +194,13 @@ public class RecordingActivity extends AppCompatActivity {
}
}
@Override
public int getAppTheme() {
return MainApplication.getTheme(this, R.style.RecThemeLight_NoActionBar, R.style.RecThemeDark_NoActionBar);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
setTheme(((MainApplication) getApplication()).getUserTheme());
super.onCreate(savedInstanceState);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |

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

@ -132,7 +132,7 @@ public class SettingsActivity extends AppCompatSettingsThemeActivity implements
@Override
public int getAppTheme() {
return MainApplication.getTheme(this, R.style.AppThemeLight, R.style.AppThemeDark);
return MainApplication.getTheme(this, R.style.RecThemeLight, R.style.RecThemeDark);
}
@Override

1
app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java
View file

@ -39,6 +39,7 @@ public class MainApplication extends com.github.axet.audiolibrary.app.MainApplic
edit.commit();
}
}
setTheme(getUserTheme());
}
}

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

@ -37,8 +37,8 @@
</string-array>
<string-array name="themes_values" translatable="false">
<item>Theme_White</item>
<item>Theme_Dark</item>
<item>@string/Theme_Light</item>
<item>@string/Theme_Dark</item>
</string-array>
<string-array name="channels_text">