From dd8dbf9232bcf32d13fe4250c99d3137978ece41 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Sat, 2 Apr 2016 20:24:59 +0300
Subject: [PATCH] fix theme func

---
 .../activities/MainActivity.java              |  2 +-
 .../audiorecorder/app/MainApplication.java    | 20 +++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

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 03082ce..091cdf1 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
@@ -437,7 +437,7 @@ public class MainActivity extends AppCompatActivity implements AbsListView.OnScr
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setTheme(((MainApplication) getApplication()).getMainTheme());
+        setTheme(MainApplication.getTheme(this, R.style.AppThemeLight_NoActionBar, R.style.AppThemeDark_NoActionBar));
 
         setContentView(R.layout.activity_main);
 
diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java b/app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java
index 5e1e7b6..9d8f644 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/app/MainApplication.java
@@ -30,24 +30,18 @@ public class MainApplication extends Application {
         context.setTheme(getUserTheme());
     }
 
-    public int getUserTheme() {
-        final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
-        String theme = shared.getString(MainApplication.PREFERENCE_THEME, "");
+    public static int getTheme(Context context, int light, int dark) {
+        final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(context);
+        String theme = shared.getString(PREFERENCE_THEME, "");
         if (theme.equals("Theme_Dark")) {
-            return R.style.AppThemeDark;
+            return dark;
         } else {
-            return R.style.AppThemeLight;
+            return light;
         }
     }
 
-    public int getMainTheme() {
-        final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
-        String theme = shared.getString(MainApplication.PREFERENCE_THEME, "");
-        if (theme.equals("Theme_Dark")) {
-            return R.style.AppThemeDark_NoActionBar;
-        } else {
-            return R.style.AppThemeLight_NoActionBar;
-        }
+    public int getUserTheme() {
+        return getTheme(this, R.style.AppThemeLight, R.style.AppThemeDark);
     }
 
     static public String formatTime(int tt) {