diff options
Diffstat (limited to 'org.fox.ttcomics/src/main/res')
6 files changed, 83 insertions, 40 deletions
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> |