diff options
Diffstat (limited to 'org.fox.ttcomics/src/main/res')
11 files changed, 8 insertions, 44 deletions
diff --git a/org.fox.ttcomics/src/main/res/layout/chooser_list.xml b/org.fox.ttcomics/src/main/res/layout/activity_directory_picker.xml index 0b93edd..f738785 100644 --- a/org.fox.ttcomics/src/main/res/layout/chooser_list.xml +++ b/org.fox.ttcomics/src/main/res/layout/activity_directory_picker.xml @@ -4,7 +4,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> <ListView android:id="@android:id/list" 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 3eb66bc..442434a 100755 --- a/org.fox.ttcomics/src/main/res/layout/activity_main.xml +++ b/org.fox.ttcomics/src/main/res/layout/activity_main.xml @@ -1,12 +1,11 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/FrameLayout1" android:fitsSystemWindows="true" android:orientation="vertical" android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent"> - <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> <it.neokree.materialtabs.MaterialTabHost android:elevation="4dp" diff --git a/org.fox.ttcomics/src/main/res/layout/preferences.xml b/org.fox.ttcomics/src/main/res/layout/activity_preferences.xml index 55b82d5..f54fcd1 100644 --- a/org.fox.ttcomics/src/main/res/layout/preferences.xml +++ b/org.fox.ttcomics/src/main/res/layout/activity_preferences.xml @@ -12,9 +12,9 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_alignParentBottom="true" - android:layout_below="@+id/actionbar_toolbar"> + android:layout_below="@+id/toolbar"> </FrameLayout> - <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> </RelativeLayout>
\ 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 7451f23..cba6feb 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,4 @@ <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"> @@ -11,6 +10,6 @@ </FrameLayout> - <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/layout/dialog_location.xml b/org.fox.ttcomics/src/main/res/layout/dialog_location.xml index 4b946d3..733e4bc 100644 --- a/org.fox.ttcomics/src/main/res/layout/dialog_location.xml +++ b/org.fox.ttcomics/src/main/res/layout/dialog_location.xml @@ -1,5 +1,4 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/linearLayout1" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" > diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml index 59103d4..55c8513 100644 --- a/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml +++ b/org.fox.ttcomics/src/main/res/layout/fragment_comic.xml @@ -1,5 +1,4 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/FrameLayout3" android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -8,13 +7,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <!-- <TextView - android:id="@+id/comic_page" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|right" - android:layout_margin="4dp" - android:alpha="0.25" - android:text="25" /> --> - </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml b/org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml index 3266a45..651ad65 100644 --- a/org.fox.ttcomics/src/main/res/layout/fragment_comics_list.xml +++ b/org.fox.ttcomics/src/main/res/layout/fragment_comics_grid.xml @@ -1,6 +1,5 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/FrameLayout4" android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -17,21 +16,6 @@ android:numColumns="auto_fit" /> </android.support.v4.widget.SwipeRefreshLayout> - <!-- <LinearLayout - android:id="@+id/no_comics" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:orientation="vertical" > - - <TextView - android:id="@+id/textView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/error_no_comic_archives_found_" /> - </LinearLayout> --> - <com.shamanland.fab.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content" 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 bae39e0..41e79c5 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,9 +2,9 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/comics_pager_container" -android:layout_width="fill_parent" + android:layout_width="fill_parent" android:animateLayoutChanges="true" -android:layout_height="fill_parent" > + android:layout_height="fill_parent" > <org.fox.ttcomics2.ViewPager xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/org.fox.ttcomics/src/main/res/layout/list_item.xml b/org.fox.ttcomics/src/main/res/layout/list_item.xml deleted file mode 100644 index f0958d6..0000000 --- a/org.fox.ttcomics/src/main/res/layout/list_item.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="10dp" - android:textSize="16sp" > -</TextView>
\ No newline at end of file diff --git a/org.fox.ttcomics/src/main/res/layout/actionbar_toolbar.xml b/org.fox.ttcomics/src/main/res/layout/toolbar.xml index 2e82015..3f24ba4 100644 --- a/org.fox.ttcomics/src/main/res/layout/actionbar_toolbar.xml +++ b/org.fox.ttcomics/src/main/res/layout/toolbar.xml @@ -2,7 +2,7 @@ <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" + android:id="@+id/toolbar" app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" android:elevation="4dp" diff --git a/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml b/org.fox.ttcomics/src/main/res/menu/context_comic_archive.xml index 58bf58f..58bf58f 100644 --- a/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml +++ b/org.fox.ttcomics/src/main/res/menu/context_comic_archive.xml |