fix wrong theme assigned to viewcomic activity

8 files changed, 23 insertions, 18 deletions

diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index 5e15002..fe2dbcb 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -34,7 +34,6 @@
         </activity>

         

         <activity

-            android:theme="@style/ViewLightTheme"

             android:name=".ViewComicActivity"

             android:label="@string/title_activity_main">

         </activity>

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);

         }

diff --git a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml
index 3fdd41a..ba9bbd3 100644
--- a/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml
+++ b/org.fox.ttcomics/src/main/res/layout-sw600dp/activity_view_comic.xml
@@ -1,15 +1,12 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    xmlns:tools="http://schemas.android.com/tools"

     android:id="@+id/FrameLayout2"

     android:layout_width="match_parent"

-    android:layout_height="match_parent" >

-

+    android:layout_height="match_parent">

 

     <FrameLayout

         android:id="@+id/comics_pager_container"

         android:layout_width="match_parent"

         android:layout_height="match_parent" >

-

     </FrameLayout>

 

 

@@ -19,5 +16,5 @@
         android:layout_height="wrap_content"

         android:visibility="gone"

         android:text="" />

-  

+

 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml b/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml
index b20b86b..ea696a2 100644
--- a/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_view_comic.xml
@@ -1,9 +1,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    xmlns:tools="http://schemas.android.com/tools"

     android:id="@+id/FrameLayout2"

-    android:background="?attr/viewComicsBackground"

     android:layout_width="match_parent"

-    android:layout_height="match_parent" >

+    android:layout_height="match_parent">

 

     <FrameLayout

         android:id="@+id/comics_pager_container"

diff --git a/org.fox.ttcomics/src/main/res/values/attrs.xml b/org.fox.ttcomics/src/main/res/values/attrs.xml
index 75347d8..35c14ff 100644
--- a/org.fox.ttcomics/src/main/res/values/attrs.xml
+++ b/org.fox.ttcomics/src/main/res/values/attrs.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>

 <resources>

-    <attr name="viewComicsBackground" format="reference|color" />

+

 </resources>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/values/style.xml b/org.fox.ttcomics/src/main/res/values/style.xml
index 7c93175..ce6a00e 100644
--- a/org.fox.ttcomics/src/main/res/values/style.xml
+++ b/org.fox.ttcomics/src/main/res/values/style.xml
@@ -7,14 +7,13 @@
     </style>

 

     <style name="ViewLightTheme" parent="AppTheme">

-        <item name="viewComicsBackground">@android:color/transparent</item>

+

     </style>

 

     <style name="ViewDarkTheme" parent="Theme.AppCompat">

-        <item name="colorPrimary">@android:color/black</item>

-        <item name="colorPrimaryDark">@android:color/black</item>

+        <item name="colorPrimary">#600000</item>

+        <item name="colorPrimaryDark">#300000</item>

         <item name="colorAccent">#FF6600</item>

-        <item name="viewComicsBackground">@android:color/black</item>

     </style>

 

 </resources>
\ No newline at end of file