fix wrong theme assigned to viewcomic activity

3 files changed, 16 insertions, 4 deletions

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java
index 03cbdef..df1f5df 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ComicFragment.java
@@ -312,10 +312,18 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
 			if (bar.isShowing()) {

 				bar.hide();

                 m_activity.hideSeekBar(true);

-				m_activity.hideSystemUI(true);

+

+                if (m_prefs.getBoolean("use_full_screen", false)) {

+                    m_activity.hideSystemUI(true);

+                }

+

 			} else {

                 m_activity.hideSeekBar(false);

-                m_activity.hideSystemUI(false);

+

+                if (m_prefs.getBoolean("use_full_screen", false)) {

+                    m_activity.hideSystemUI(false);

+                }

+

 				bar.show();

 			}

 		}

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
index 620abb8..9e99b5b 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/CommonActivity.java
@@ -51,7 +51,7 @@ public class CommonActivity extends ActionBarActivity {
 	@Override

     public void onCreate(Bundle savedInstanceState) {

         super.onCreate(savedInstanceState);

-        

+

     	m_prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

     	

     	initDatabase();

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java
index e77129b..249e965 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics/ViewComicActivity.java
@@ -11,6 +11,7 @@ import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;

 import android.net.Uri;

 import android.os.Bundle;

+import android.preference.PreferenceManager;

 import android.support.v4.app.FragmentTransaction;

 import android.util.Log;

 import android.view.LayoutInflater;

@@ -34,10 +35,13 @@ public class ViewComicActivity extends CommonActivity {
     @SuppressLint("NewApi")

 	@Override

     public void onCreate(Bundle savedInstanceState) {

-        super.onCreate(savedInstanceState);

+        m_prefs = PreferenceManager

+                .getDefaultSharedPreferences(getApplicationContext());

 

         setTheme(m_prefs.getBoolean("use_dark_theme", false) ? R.style.ViewDarkTheme : R.style.ViewLightTheme);

 

+        super.onCreate(savedInstanceState);

+

         if (m_prefs.getBoolean("prevent_screen_sleep", false)) {

             getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

         }