diff --git a/app/build.gradle b/app/build.gradle
index da8adb1..87d1745 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 240
- versionName "3.1.9"
+ versionCode 241
+ versionName "3.1.10"
}
signingConfigs {
release {
@@ -55,5 +55,5 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
- compile 'com.github.axet:android-audio-library:1.0.80' // compile project(':android-audio-library')
+ compile 'com.github.axet:android-audio-library:1.0.82' // compile 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 4d6db81..8f18a3e 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
@@ -28,6 +28,7 @@ import android.widget.Toast;
import com.github.axet.androidlibrary.services.StorageProvider;
import com.github.axet.androidlibrary.widgets.AboutPreferenceCompat;
+import com.github.axet.androidlibrary.widgets.AppCompatThemeActivity;
import com.github.axet.androidlibrary.widgets.SearchView;
import com.github.axet.audiolibrary.app.Recordings;
import com.github.axet.audiolibrary.app.Storage;
@@ -35,7 +36,7 @@ import com.github.axet.audiorecorder.R;
import com.github.axet.audiorecorder.app.MainApplication;
import com.github.axet.audiorecorder.services.RecordingService;
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends AppCompatThemeActivity {
public final static String TAG = MainActivity.class.getSimpleName();
FloatingActionButton fab;
@@ -47,8 +48,6 @@ public class MainActivity extends AppCompatActivity {
View progressEmpty;
View progressText;
- int themeId;
-
BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@@ -66,18 +65,13 @@ public class MainActivity extends AppCompatActivity {
context.startActivity(i);
}
- public void setAppTheme(int id) {
- super.setTheme(id);
- themeId = id;
- }
-
- public static int getAppTheme(Context context) {
- return MainApplication.getTheme(context, R.style.AppThemeLight_NoActionBar, R.style.AppThemeDark_NoActionBar);
+ @Override
+ public int getAppTheme() {
+ return MainApplication.getTheme(this, R.style.AppThemeLight_NoActionBar, R.style.AppThemeDark_NoActionBar);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
- setAppTheme(getAppTheme(this));
super.onCreate(savedInstanceState);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
@@ -196,12 +190,6 @@ public class MainActivity extends AppCompatActivity {
super.onResume();
Log.d(TAG, "onResume");
- if (themeId != getAppTheme(this)) {
- finish();
- MainActivity.startActivity(this);
- return;
- }
-
invalidateOptionsMenu(); // update storage folder intent
try {
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 499fe27..0954ab2 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
@@ -26,6 +26,7 @@ import android.view.MenuItem;
import android.widget.ProgressBar;
import android.widget.Toast;
+import com.github.axet.androidlibrary.widgets.AppCompatSettingsThemeActivity;
import com.github.axet.androidlibrary.widgets.NameFormatPreferenceCompat;
import com.github.axet.androidlibrary.widgets.OpenFileDialog;
import com.github.axet.androidlibrary.widgets.SilencePreferenceCompat;
@@ -53,7 +54,7 @@ import java.util.List;
* href="http://developer.android.com/guide/topics/ui/settings.html">Settings
* API Guide for more information on developing a Settings UI.
*/
-public class SettingsActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener, PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback {
+public class SettingsActivity extends AppCompatSettingsThemeActivity implements PreferenceFragmentCompat.OnPreferenceDisplayDialogCallback {
public static final int RESULT_STORAGE = 1;
@@ -129,20 +130,22 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
.getString(preference.getKey(), ""));
}
- public static int getAppTheme(Context context) {
- return MainApplication.getTheme(context, R.style.AppThemeLight, R.style.AppThemeDark);
+ @Override
+ public int getAppTheme() {
+ return MainApplication.getTheme(this, R.style.AppThemeLight, R.style.AppThemeDark);
+ }
+
+ @Override
+ public String getAppThemeKey() {
+ return MainApplication.PREFERENCE_THEME;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
- setTheme(getAppTheme(this));
super.onCreate(savedInstanceState);
setupActionBar();
- final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
- shared.registerOnSharedPreferenceChangeListener(this);
-
getSupportFragmentManager().beginTransaction().replace(android.R.id.content, new GeneralPreferenceFragment()).commit();
}
@@ -180,11 +183,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
- if (key.equals(MainApplication.PREFERENCE_THEME)) {
- finish();
- startActivity(new Intent(this, SettingsActivity.class));
- overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
- }
+ super.onSharedPreferenceChanged(sharedPreferences, key);
if (key.equals(MainApplication.PREFERENCE_CONTROLS)) {
if (sharedPreferences.getBoolean(MainApplication.PREFERENCE_CONTROLS, false)) {
RecordingService.start(this);
@@ -200,8 +199,6 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
@Override
protected void onDestroy() {
super.onDestroy();
- final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
- shared.unregisterOnSharedPreferenceChangeListener(this);
}
@Override
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 98cdde9..640eaf8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,7 +17,7 @@
- - Theme Weiß (Standard)
+ - Theme Weiß
- Theme Dunkel
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 5566108..2c98ba7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -17,7 +17,7 @@
- - Tema Bianco (prefedinito)
+ - Tema Bianco
- Tema Scuro
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e4023bf..b178785 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -17,7 +17,7 @@
- - テーマ ホワイト (デフォルト)
+ - テーマ ホワイト
- テーマ ダーク
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d670bde..a817173 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -17,7 +17,7 @@
- - Claro (padrão)
+ - Claro
- Escuro
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 230c117..61de50e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2,7 +2,7 @@
Аудио Рекордер
- - Тема Светлая (по умолчанию)
+ - Тема Светлая
- Тема Темная
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index c164fc6..845311d 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -17,7 +17,7 @@
- - Theme Svetlá (predvolené)
+ - Theme Svetlá
- Theme Tmavá
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 35ddaca..0910bdf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,7 @@
- - Theme White (default)
+ - Theme White
- Theme Dark