From d0e81783dafc4e46bd222373f84165b12d14118c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 8 Jun 2015 19:49:47 +0300
Subject: more material stuff all around, minor UX changes

---
 org.fox.ttcomics/build.gradle                      |  10 ++-
 org.fox.ttcomics/libs/nineoldandroids-2.4.0.jar    | Bin 0 -> 110746 bytes
 org.fox.ttcomics/org.fox.ttcomics.iml              |  12 +--
 org.fox.ttcomics/src/main/AndroidManifest.xml      |   4 +-
 .../main/java/org/fox/ttcomics2/Application.java   |   5 +-
 .../java/org/fox/ttcomics2/ComicListFragment.java  |  13 +++-
 .../main/java/org/fox/ttcomics2/ComicPager.java    |  58 ++++++++++-----
 .../java/org/fox/ttcomics2/CommonActivity.java     |  34 +++++----
 .../main/java/org/fox/ttcomics2/MainActivity.java  |   2 +
 .../org/fox/ttcomics2/PreferencesActivity.java     |   1 +
 .../java/org/fox/ttcomics2/ViewComicActivity.java  |  14 ++--
 .../src/main/res/layout/actionbar_toolbar.xml      |  12 +++
 .../src/main/res/layout/activity_main.xml          |   3 +
 .../src/main/res/layout/activity_view_comic.xml    |   3 +
 .../src/main/res/layout/fragment_comics_pager.xml  |  81 ++++++++++++---------
 .../src/main/res/layout/preferences.xml            |  20 ++++-
 org.fox.ttcomics/src/main/res/values/style.xml     |   4 +-
 17 files changed, 180 insertions(+), 96 deletions(-)
 create mode 100644 org.fox.ttcomics/libs/nineoldandroids-2.4.0.jar
 create mode 100644 org.fox.ttcomics/src/main/res/layout/actionbar_toolbar.xml

(limited to 'org.fox.ttcomics')

diff --git a/org.fox.ttcomics/build.gradle b/org.fox.ttcomics/build.gradle
index a017269..2c46e7a 100755
--- a/org.fox.ttcomics/build.gradle
+++ b/org.fox.ttcomics/build.gradle
@@ -23,12 +23,14 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:21.0.3'
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    compile 'com.android.support:cardview-v7:21.0.3'
+    compile 'com.android.support:support-v4:22.2.0'
+    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:cardview-v7:22.2.0'
     compile 'it.neokree:MaterialTabs:0.11'
     compile 'com.shamanland:fab:0.0.5'
     compile files('libs/universal-image-loader-1.9.3.jar')
     compile 'ch.acra:acra:4.5.0'
-    compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.1.0@aar'
+    compile 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
+    compile 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
+    compile files('libs/nineoldandroids-2.4.0.jar')
 }
diff --git a/org.fox.ttcomics/libs/nineoldandroids-2.4.0.jar b/org.fox.ttcomics/libs/nineoldandroids-2.4.0.jar
new file mode 100644
index 0000000..43ee45f
Binary files /dev/null and b/org.fox.ttcomics/libs/nineoldandroids-2.4.0.jar differ
diff --git a/org.fox.ttcomics/org.fox.ttcomics.iml b/org.fox.ttcomics/org.fox.ttcomics.iml
index 3991b97..577971d 100755
--- a/org.fox.ttcomics/org.fox.ttcomics.iml
+++ b/org.fox.ttcomics/org.fox.ttcomics.iml
@@ -86,15 +86,17 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="view-pager-transforms-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="lib-core-3.1.0" level="project" />
+    <orderEntry type="library" exported="" name="nineoldandroids-2.4.0" level="project" />
     <orderEntry type="library" exported="" name="android-ui-1.2" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="acra-4.5.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="universal-image-loader-1.9.3" level="project" />
-    <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="view-pager-transforms-1.2.32" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="fab-0.0.5" level="project" />
+    <orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="MaterialTabs-0.11" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/AndroidManifest.xml b/org.fox.ttcomics/src/main/AndroidManifest.xml
index 026a860..d3f4e0e 100755
--- a/org.fox.ttcomics/src/main/AndroidManifest.xml
+++ b/org.fox.ttcomics/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttcomics2"
-    android:versionCode="60"
-    android:versionName="1.20" >
+    android:versionCode="61"
+    android:versionName="1.21" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java
index 8cf7c7a..7ba041b 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/Application.java
@@ -12,7 +12,10 @@ public class Application extends android.app.Application {
     @Override
     public final void onCreate() {
         super.onCreate();
-        ACRA.init(this);
+
+        if (!BuildConfig.DEBUG) {
+            ACRA.init(this);
+        }
     }
 
 }
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
index 796a0e2..2b3c2c5 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
@@ -28,6 +28,8 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.nhaarman.listviewanimations.appearance.AnimationAdapter;
+import com.nhaarman.listviewanimations.appearance.simple.ScaleInAnimationAdapter;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.shamanland.fab.FloatingActionButton;
 import com.shamanland.fab.ShowHideOnScroll;
@@ -54,6 +56,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 	private int m_mode = 0;
 	private String m_baseDirectory = "";
 	private SwipeRefreshLayout m_swipeLayout;
+	private AnimationAdapter m_animationAdapter;
 
 	public ComicListFragment() {
 		super();
@@ -146,7 +149,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 					overflow.setImageResource(R.drawable.ic_dots_vertical);
 
 					overflow.setOnClickListener(new View.OnClickListener() {
-						
+
 						@Override
 						public void onClick(View v) {
 							getActivity().openContextMenu(v);
@@ -203,7 +206,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 
        	m_adapter = new ComicsListAdapter(getActivity(), R.layout.comics_grid_row, createCursor(),
        			new String[] { "filename" }, new int[] { R.id.file_name }, 0);
-
+		m_animationAdapter = new ScaleInAnimationAdapter(m_adapter);
 
 		FloatingActionButton fab = (FloatingActionButton) view.findViewById(R.id.fab);
 		fab.setOnClickListener(new View.OnClickListener() {
@@ -214,7 +217,10 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 		});
 
 		GridView grid = (GridView) view.findViewById(R.id.comics_grid);
-		grid.setAdapter(m_adapter);
+
+		m_animationAdapter.setAbsListView(grid);
+		grid.setAdapter(m_animationAdapter);
+
 		grid.setOnTouchListener(new ShowHideOnScroll(fab));
 		grid.setEmptyView(view.findViewById(R.id.no_comics));
 		grid.setOnItemClickListener(this);
@@ -412,6 +418,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 			protected void onPostExecute(Integer result) {
 				if (isAdded() && m_adapter != null) {
 					m_adapter.changeCursor(createCursor());
+					m_animationAdapter.reset();
 					m_adapter.notifyDataSetChanged();
 
                     if (m_swipeLayout != null) m_swipeLayout.setRefreshing(false);
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
index 721821a..8c4f33a 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
@@ -4,10 +4,12 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,11 +29,18 @@ public class ComicPager extends Fragment {
     private SeekBar m_seekBar;
     private TextView m_currentPage;
     private TextView m_totalPages;
+	private View m_bottomBar;
+
+    public void hideReadingUI(boolean hide) {
+        m_bottomBar.setVisibility(hide ? View.GONE : View.VISIBLE);
+
+		ActionBar actionBar = m_activity.getSupportActionBar();
+
+		if (hide)
+			actionBar.hide();
+		else
+			actionBar.show();
 
-    public void hideSeekBar(boolean hide) {
-        m_seekBar.setVisibility(hide ? View.GONE : View.VISIBLE);
-        m_currentPage.setVisibility(hide ? View.GONE : View.VISIBLE);
-        m_totalPages.setVisibility(hide ? View.GONE : View.VISIBLE);
     }
 
     private class PagerAdapter extends FragmentStatePagerAdapter {
@@ -127,27 +136,29 @@ public class ComicPager extends Fragment {
             m_currentPage.setText(String.valueOf(position + 1));
             m_totalPages.setText(String.valueOf(m_archive.getCount()));
 
+			m_bottomBar = view.findViewById(R.id.comics_bottom_bar);
+
             m_seekBar = (SeekBar) view.findViewById(R.id.comics_seek_bar);
-            m_seekBar.setMax(m_archive.getCount()-1);
+            m_seekBar.setMax(m_archive.getCount() - 1);
             m_seekBar.setProgress(position);
             m_seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                    if (fromUser) {
-                        setCurrentItem(progress);
-                    }
-                }
+				@Override
+				public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+					if (fromUser) {
+						setCurrentItem(progress);
+					}
+				}
 
-                @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {
+				@Override
+				public void onStartTrackingTouch(SeekBar seekBar) {
 
-                }
+				}
 
-                @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {
+				@Override
+				public void onStopTrackingTouch(SeekBar seekBar) {
 
-                }
-            });
+				}
+			});
 
 			pager.setAdapter(m_adapter);
             pager.setCurrentItem(position);
@@ -157,8 +168,15 @@ public class ComicPager extends Fragment {
 
             if (m_prefs.getBoolean("use_full_screen", false)) {
                 m_activity.hideSystemUI(true);
-                hideSeekBar(true);
             }
+
+			new Handler().postDelayed(new Runnable() {
+				@Override
+				public void run() {
+					hideReadingUI(true);
+				}
+			}, 1000);
+
 			
 		} catch (IOException e) {
 			m_activity.toast(R.string.error_could_not_open_comic_archive);
@@ -174,6 +192,8 @@ public class ComicPager extends Fragment {
                 if (m_prefs.getBoolean("use_full_screen", false)) {
                     m_activity.hideSystemUI(true);
                 }
+
+				hideReadingUI(true);
 			}
 			
 			public void onPageScrolled(int arg0, float arg1, int arg2) {
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
index f715604..da2198d 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/CommonActivity.java
@@ -582,24 +582,26 @@ public class CommonActivity extends ActionBarActivity {
     public void hideSystemUI(boolean hide) {
         View decorView = getWindow().getDecorView();
 
-        if (hide) {
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+			if (hide) {
 
-                decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-                                | View.SYSTEM_UI_FLAG_FULLSCREEN
-                                | View.SYSTEM_UI_FLAG_IMMERSIVE);
+				decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+						| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+						| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+						| View.SYSTEM_UI_FLAG_FULLSCREEN
+						| View.SYSTEM_UI_FLAG_IMMERSIVE);
 
-            } else {
-                decorView.setSystemUiVisibility(View.STATUS_BAR_HIDDEN | View.SYSTEM_UI_FLAG_LOW_PROFILE);
-            }
+			} else {
 
-            getSupportActionBar().hide();
-
-        } else {
-            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
-        }
-    }
+				decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
 
+			}
+		} else {
+			if (hide) {
+				decorView.setSystemUiVisibility(View.STATUS_BAR_HIDDEN | View.SYSTEM_UI_FLAG_LOW_PROFILE);
+			} else {
+				decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+			}
+		}
+	}
 }
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
index 9dda29b..bae798a 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -33,6 +34,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_main);
+		setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));;
         setTitle(R.string.app_name);
 
         tabHost = (MaterialTabHost) this.findViewById(R.id.materialTabHost);
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
index fe4bed6..12d112d 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/PreferencesActivity.java
@@ -15,6 +15,7 @@ public class PreferencesActivity extends CommonActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.preferences);
+        setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));;
 
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
index abbf835..e91f513 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ViewComicActivity.java
@@ -13,6 +13,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -46,13 +47,14 @@ public class ViewComicActivity extends CommonActivity {
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         }
 
-        if (m_prefs.getBoolean("use_full_screen", false)) {
-            hideSystemUI(true);
-        }
-
         setContentView(R.layout.activity_view_comic);
+		setSupportActionBar((Toolbar) findViewById(R.id.actionbar_toolbar));;
+
+		if (m_prefs.getBoolean("use_full_screen", false)) {
+			hideSystemUI(true);
+		}
 
-        if (savedInstanceState == null) {
+		if (savedInstanceState == null) {
         	m_fileName = getIntent().getStringExtra("fileName"); 
         	
         	ComicPager cp = new ComicPager();
@@ -314,7 +316,7 @@ public class ViewComicActivity extends CommonActivity {
         ComicPager pager = (ComicPager) getSupportFragmentManager().findFragmentByTag(FRAG_COMICS_PAGER);
 
         if (pager != null) {
-            pager.hideSeekBar(hide);
+            pager.hideReadingUI(hide);
         }
     }
 
diff --git a/org.fox.ttcomics/src/main/res/layout/actionbar_toolbar.xml b/org.fox.ttcomics/src/main/res/layout/actionbar_toolbar.xml
new file mode 100644
index 0000000..2e82015
--- /dev/null
+++ b/org.fox.ttcomics/src/main/res/layout/actionbar_toolbar.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/actionbar_toolbar"
+    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+    android:elevation="4dp"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:minHeight="?attr/actionBarSize"
+    android:background="?attr/colorPrimary" />
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/activity_main.xml b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
index 41b5d2c..3eb66bc 100755
--- a/org.fox.ttcomics/src/main/res/layout/activity_main.xml
+++ b/org.fox.ttcomics/src/main/res/layout/activity_main.xml
@@ -6,7 +6,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent">
 
+    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+
     <it.neokree.materialtabs.MaterialTabHost
+        android:elevation="4dp"
         android:id="@+id/materialTabHost"
         android:layout_width="match_parent"
         android:layout_height="48dp"
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 8016730..7451f23 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,5 +1,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/FrameLayout2"
+    android:animateLayoutChanges="true"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -9,5 +10,7 @@
         android:layout_height="match_parent" >
 
     </FrameLayout>
+
+    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
   
 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
index fa5ebef..63ba73b 100755
--- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
+++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_pager.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 android:id="@+id/comics_pager_container"
 android:layout_width="fill_parent"
+    android:animateLayoutChanges="true"
 android:layout_height="fill_parent" >
 
     <org.fox.ttcomics2.ViewPager
@@ -9,42 +10,54 @@ android:layout_height="fill_parent" >
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:id="@+id/comics_pager"
-        android:layout_above="@+id/comics_seek_bar" />
+        android:layout_alignParentBottom="true" />
 
-    <SeekBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/comics_seek_bar"
-        android:layout_alignParentBottom="true"
-        android:layout_toRightOf="@+id/comics_page"
-        android:layout_toLeftOf="@+id/comics_total_pages"
-        android:layout_toStartOf="@+id/comics_total_pages" />
-
-    <TextView
-        android:layout_width="60dp"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="1123"
-        android:id="@+id/comics_total_pages"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:singleLine="true"
-        android:layout_alignTop="@+id/comics_seek_bar"
-        android:gravity="center" />
-
-    <TextView
-        android:layout_width="60dp"
+    <RelativeLayout
+        android:background="?colorButtonNormal"
+        android:id="@+id/comics_bottom_bar"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="1"
-        android:id="@+id/comics_page"
-        android:singleLine="true"
-        android:gravity="center"
-        android:layout_below="@+id/comics_pager"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentBottom="true" />
+        android:layout_alignParentBottom="true">
+
+        <SeekBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/comics_seek_bar"
+            android:layout_alignParentBottom="false"
+            android:layout_toRightOf="@+id/comics_page"
+            android:layout_toLeftOf="@+id/comics_total_pages"
+            android:layout_toStartOf="@+id/comics_total_pages" />
+
+        <TextView
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="1123"
+            android:id="@+id/comics_total_pages"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:singleLine="true"
+            android:layout_alignTop="@+id/comics_seek_bar"
+            android:gravity="center"
+            android:layout_alignBottom="@+id/comics_seek_bar" />
+
+        <TextView
+            android:layout_width="60dp"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="1"
+            android:id="@+id/comics_page"
+            android:singleLine="true"
+            android:gravity="center"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentBottom="false"
+            android:layout_alignTop="@+id/comics_seek_bar"
+            android:layout_alignBottom="@+id/comics_seek_bar" />
+
+
+    </RelativeLayout>
+
 
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttcomics/src/main/res/layout/preferences.xml b/org.fox.ttcomics/src/main/res/layout/preferences.xml
index e68fa9e..55b82d5 100644
--- a/org.fox.ttcomics/src/main/res/layout/preferences.xml
+++ b/org.fox.ttcomics/src/main/res/layout/preferences.xml
@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/preferences_container"
-    android:fitsSystemWindows="true"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-</FrameLayout>
\ No newline at end of file
+    <FrameLayout        
+        android:id="@+id/preferences_container"
+        android:fitsSystemWindows="true"
+        android:layout_width="match_parent"
+        android:layout_height="502dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_below="@+id/actionbar_toolbar">
+    </FrameLayout>
+
+    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+
+</RelativeLayout>
\ 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 23c3f70..6e85b50 100755
--- a/org.fox.ttcomics/src/main/res/values/style.xml
+++ b/org.fox.ttcomics/src/main/res/values/style.xml
@@ -1,6 +1,6 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">#607D8B</item>
         <item name="colorPrimaryDark">#455A64</item>
         <item name="colorAccent">#FF5722</item>
@@ -10,7 +10,7 @@
 
     </style>
 
-    <style name="ViewDarkTheme" parent="Theme.AppCompat">
+    <style name="ViewDarkTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">#607D8B</item>
         <item name="colorPrimaryDark">#455A64</item>
         <item name="colorAccent">#FF5722</item>
-- 
cgit v1.2.3