From 6059dd3647eceffc97f2d6e4601513f69ba98a8b Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <axet@me.com>
Date: Fri, 7 Apr 2017 23:11:20 +0300
Subject: [PATCH] fix theme

---
 .../axet/audiorecorder/activities/MainActivity.java       | 8 ++++----
 .../axet/audiorecorder/activities/SettingsActivity.java   | 5 +++++
 .../github/axet/audiorecorder/app/MainApplication.java    | 8 +-------
 3 files changed, 10 insertions(+), 11 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 efb7b52..fc5895d 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
@@ -64,13 +64,13 @@ public class MainActivity extends AppCompatActivity {
         themeId = id;
     }
 
-    int getAppTheme() {
-        return MainApplication.getTheme(this, R.style.AppThemeLight_NoActionBar, R.style.AppThemeDark_NoActionBar);
+    public static int getAppTheme(Context context) {
+        return MainApplication.getTheme(context, R.style.AppThemeLight_NoActionBar, R.style.AppThemeDark_NoActionBar);
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setAppTheme(getAppTheme());
+        setAppTheme(getAppTheme(this));
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_main);
@@ -158,7 +158,7 @@ public class MainActivity extends AppCompatActivity {
         super.onResume();
         Log.d(TAG, "onResume");
 
-        if (themeId != getAppTheme()) {
+        if (themeId != getAppTheme(this)) {
             finish();
             MainActivity.startActivity(this);
             return;
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 929684c..f5854ca 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
@@ -144,8 +144,13 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
         bindPreferenceSummaryToValue(pm.findPreference(MainApplication.PREFERENCE_CHANNELS));
     }
 
+    public static int getAppTheme(Context context) {
+        return MainApplication.getTheme(context, R.style.AppThemeLight, R.style.AppThemeDark);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setTheme(getAppTheme(this));
         super.onCreate(savedInstanceState);
 
         setupActionBar();
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 6bd228d..42e4cc6 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
@@ -1,13 +1,7 @@
 package com.github.axet.audiorecorder.app;
 
-import android.app.Application;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.media.AudioFormat;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
 
-import com.github.axet.androidlibrary.app.MainLibrary;
-import com.github.axet.androidlibrary.widgets.ThemeUtils;
 import com.github.axet.audiorecorder.R;
 
 public class MainApplication extends com.github.axet.audiolibrary.app.MainApplication {