Merge branch 'audiorecorder-3.1.10'

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')
 }

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 {

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</a> 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

app/src/main/res/values-de/strings.xml

@@ -17,7 +17,7 @@
     </string-array>
 
     <string-array name="themes_text">
-        <item>Theme Weiß (Standard)</item>
+        <item>Theme Weiß</item>
         <item>Theme Dunkel</item>
     </string-array>
 

app/src/main/res/values-it/strings.xml

@@ -17,7 +17,7 @@
     </string-array>
 
     <string-array name="themes_text">
-        <item>Tema Bianco (prefedinito)</item>
+        <item>Tema Bianco</item>
         <item>Tema Scuro</item>
     </string-array>
 

app/src/main/res/values-ja/strings.xml

@@ -17,7 +17,7 @@
     </string-array>
 
     <string-array name="themes_text">
-        <item>テーマ ホワイト (デフォルト)</item>
+        <item>テーマ ホワイト</item>
         <item>テーマ ダーク</item>
     </string-array>
 

app/src/main/res/values-pt-rBR/strings.xml

@@ -17,7 +17,7 @@
     </string-array>
 
     <string-array name="themes_text">
-        <item>Claro (padrão)</item>
+        <item>Claro</item>
         <item>Escuro</item>
     </string-array>
 

app/src/main/res/values-ru/strings.xml

@@ -2,7 +2,7 @@
     <string name="app_name">Аудио Рекордер</string>
 
     <string-array name="themes_text">
-        <item>Тема Светлая (по умолчанию)</item>
+        <item>Тема Светлая</item>
         <item>Тема Темная</item>
     </string-array>
 

app/src/main/res/values-sk/strings.xml

@@ -17,7 +17,7 @@
     </string-array>
 
     <string-array name="themes_text">
-        <item>Theme Svetlá (predvolené)</item>
+        <item>Theme Svetlá</item>
         <item>Theme Tmavá</item>
     </string-array>
 

app/src/main/res/values/strings.xml

@@ -32,7 +32,7 @@
     </string-array>
 
     <string-array name="themes_text">
-        <item>Theme White (default)</item>
+        <item>Theme White</item>
         <item>Theme Dark</item>
     </string-array>