diff options
author | Andrew Dolgov <[email protected]> | 2015-06-10 19:24:24 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-10 19:24:24 +0300 |
commit | dffc737a93f90ec866cb9256e9768b08b13de93c (patch) | |
tree | 877be4a66846acd60bd6b04254624c4b0dddaf84 /org.fox.ttrss/src/main/res | |
parent | 415d79199dcb39cac7e8f7d1979dfcbfaaa40aa6 (diff) |
refactor layouts naming scheme
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_headlines_articles.xml (renamed from org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml) | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_headlines_articles.xml (renamed from org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml) | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml (renamed from org.fox.ttrss/src/main/res/layout/headlines_articles.xml) | 2 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/activity_share.xml (renamed from org.fox.ttrss/src/main/res/layout/share.xml) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout/activity_subscribe.xml (renamed from org.fox.ttrss/src/main/res/layout/subscribe.xml) | 0 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/article_images_pager.xml | 2 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml (renamed from org.fox.ttrss/src/main/res/layout/select_font_size_dialog.xml) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout/drawer_divider.xml (renamed from org.fox.ttrss/src/main/res/layout/headlines_divider.xml) | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout/fragment_article.xml (renamed from org.fox.ttrss/src/main/res/layout/article_fragment.xml) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout/fragment_cats.xml (renamed from org.fox.ttrss/src/main/res/layout/cats_fragment.xml) | 0 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/fragment_dummy.xml (renamed from org.fox.ttrss/src/main/res/layout/dummy_fragment.xml) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout/fragment_feeds.xml (renamed from org.fox.ttrss/src/main/res/layout/feeds_fragment.xml) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout/fragment_headlines.xml (renamed from org.fox.ttrss/src/main/res/layout/headlines_fragment.xml) | 0 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/fragment_loading.xml (renamed from org.fox.ttrss/src/main/res/layout/loading_fragment.xml) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | org.fox.ttrss/src/main/res/layout/headlines.xml | 2 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/login.xml | 2 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/preferences.xml | 4 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/res/layout/toolbar.xml (renamed from org.fox.ttrss/src/main/res/layout/actionbar_toolbar.xml) | 2 |
19 files changed, 12 insertions, 13 deletions
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_headlines_articles.xml index 4067b7b4..0e904edc 100755..100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_headlines_articles.xml @@ -5,7 +5,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" /> <FrameLayout android:id="@+id/sw600dp_anchor" diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml index 88e84742..c89f3baa 100755..100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml @@ -4,7 +4,7 @@ android:fitsSystemWindows="true" xmlns:android="http://schemas.android.com/apk/res/android"> - <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> <LinearLayout android:id="@+id/fragment_container" @@ -12,7 +12,7 @@ android:layout_height="fill_parent" android:baselineAligned="false" android:orientation="horizontal" - android:layout_below="@+id/actionbar_toolbar"> + android:layout_below="@+id/toolbar"> <FrameLayout android:id="@+id/sw600dp_anchor" diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_headlines_articles.xml index 05e3fdda..47c84639 100755..100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_headlines_articles.xml @@ -4,7 +4,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> <FrameLayout android:id="@+id/sw600dp_anchor" @@ -19,7 +19,7 @@ android:layout_height="match_parent" android:baselineAligned="false" android:orientation="horizontal" - android:layout_below="@+id/actionbar_toolbar"> + android:layout_below="@+id/toolbar"> <FrameLayout android:paddingRight="4dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml index de249cfb..e9cfdc35 100755..100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml @@ -20,5 +20,5 @@ android:background="?headlinesBackground"> </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.ttrss/src/main/res/layout/share.xml b/org.fox.ttrss/src/main/res/layout/activity_share.xml index b2ae8d12..b2ae8d12 100644 --- a/org.fox.ttrss/src/main/res/layout/share.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_share.xml diff --git a/org.fox.ttrss/src/main/res/layout/subscribe.xml b/org.fox.ttrss/src/main/res/layout/activity_subscribe.xml index 8027faf4..8027faf4 100755..100644 --- a/org.fox.ttrss/src/main/res/layout/subscribe.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_subscribe.xml diff --git a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml index 90840788..8744af67 100755 --- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml @@ -37,6 +37,6 @@ android:visibility="invisible" /> - <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> </RelativeLayout> diff --git a/org.fox.ttrss/src/main/res/layout/select_font_size_dialog.xml b/org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml index f77cc151..f77cc151 100644 --- a/org.fox.ttrss/src/main/res/layout/select_font_size_dialog.xml +++ b/org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml diff --git a/org.fox.ttrss/src/main/res/layout/headlines_divider.xml b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml index 40294376..d47c3b5b 100755..100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_divider.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/headlines_footer" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index 4a1709b4..4a1709b4 100755..100644 --- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml diff --git a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml index ff2e8307..ff2e8307 100755..100644 --- a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml diff --git a/org.fox.ttrss/src/main/res/layout/dummy_fragment.xml b/org.fox.ttrss/src/main/res/layout/fragment_dummy.xml index dd1e9876..dd1e9876 100644 --- a/org.fox.ttrss/src/main/res/layout/dummy_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_dummy.xml diff --git a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml index eec49bc6..eec49bc6 100755..100644 --- a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml diff --git a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml index acddc7a8..acddc7a8 100755..100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml diff --git a/org.fox.ttrss/src/main/res/layout/loading_fragment.xml b/org.fox.ttrss/src/main/res/layout/fragment_loading.xml index b9b3e977..b9b3e977 100644 --- a/org.fox.ttrss/src/main/res/layout/loading_fragment.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_loading.xml diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/headlines.xml index 233a6a69..69ef2c15 100755..100644 --- a/org.fox.ttrss/src/main/res/layout/headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines.xml @@ -17,7 +17,7 @@ android:layout_height="match_parent" android:background="?headlinesBackground"></FrameLayout> - <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> </FrameLayout> diff --git a/org.fox.ttrss/src/main/res/layout/login.xml b/org.fox.ttrss/src/main/res/layout/login.xml index a81faa56..add839b5 100755 --- a/org.fox.ttrss/src/main/res/layout/login.xml +++ b/org.fox.ttrss/src/main/res/layout/login.xml @@ -4,7 +4,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" > - <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> <TextView android:background="?android:colorBackground" diff --git a/org.fox.ttrss/src/main/res/layout/preferences.xml b/org.fox.ttrss/src/main/res/layout/preferences.xml index c742fc88..431b7da4 100755 --- a/org.fox.ttrss/src/main/res/layout/preferences.xml +++ b/org.fox.ttrss/src/main/res/layout/preferences.xml @@ -14,9 +14,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.ttrss/src/main/res/layout/actionbar_toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml index 85ebaeb2..d8f9bfab 100644 --- a/org.fox.ttrss/src/main/res/layout/actionbar_toolbar.xml +++ b/org.fox.ttrss/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" android:elevation="4dp" app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" |