From dffc737a93f90ec866cb9256e9768b08b13de93c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 10 Jun 2015 19:24:24 +0300
Subject: refactor layouts naming scheme

---
 .../activity_headlines_articles.xml                |  43 ++++++
 .../src/main/res/layout-sw600dp-land/headlines.xml |   4 +-
 .../res/layout-sw600dp-land/headlines_articles.xml |  43 ------
 .../activity_headlines_articles.xml                |  43 ++++++
 .../res/layout-sw600dp-port/headlines_articles.xml |  43 ------
 .../src/main/res/layout/actionbar_toolbar.xml      |  12 --
 .../res/layout/activity_headlines_articles.xml     |  24 ++++
 .../src/main/res/layout/activity_share.xml         |  56 ++++++++
 .../src/main/res/layout/activity_subscribe.xml     |  73 ++++++++++
 .../src/main/res/layout/article_fragment.xml       | 157 ---------------------
 .../src/main/res/layout/article_images_pager.xml   |   2 +-
 .../src/main/res/layout/cats_fragment.xml          |  20 ---
 .../main/res/layout/dialog_select_font_size.xml    |  22 +++
 .../src/main/res/layout/drawer_divider.xml         |  14 ++
 .../src/main/res/layout/dummy_fragment.xml         |   7 -
 .../src/main/res/layout/feeds_fragment.xml         |  22 ---
 .../src/main/res/layout/fragment_article.xml       | 157 +++++++++++++++++++++
 .../src/main/res/layout/fragment_cats.xml          |  20 +++
 .../src/main/res/layout/fragment_dummy.xml         |   7 +
 .../src/main/res/layout/fragment_feeds.xml         |  22 +++
 .../src/main/res/layout/fragment_headlines.xml     |  32 +++++
 .../src/main/res/layout/fragment_loading.xml       |  14 ++
 org.fox.ttrss/src/main/res/layout/headlines.xml    |   2 +-
 .../src/main/res/layout/headlines_articles.xml     |  24 ----
 .../src/main/res/layout/headlines_divider.xml      |  15 --
 .../src/main/res/layout/headlines_fragment.xml     |  32 -----
 .../src/main/res/layout/loading_fragment.xml       |  14 --
 org.fox.ttrss/src/main/res/layout/login.xml        |   2 +-
 org.fox.ttrss/src/main/res/layout/preferences.xml  |   4 +-
 .../main/res/layout/select_font_size_dialog.xml    |  22 ---
 org.fox.ttrss/src/main/res/layout/share.xml        |  56 --------
 org.fox.ttrss/src/main/res/layout/subscribe.xml    |  73 ----------
 org.fox.ttrss/src/main/res/layout/toolbar.xml      |  12 ++
 33 files changed, 546 insertions(+), 547 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_headlines_articles.xml
 mode change 100755 => 100644 org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_headlines_articles.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/actionbar_toolbar.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_share.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/activity_subscribe.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/article_fragment.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/cats_fragment.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/drawer_divider.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/dummy_fragment.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/feeds_fragment.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/fragment_article.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/fragment_cats.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/fragment_dummy.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/fragment_feeds.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/fragment_loading.xml
 mode change 100755 => 100644 org.fox.ttrss/src/main/res/layout/headlines.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/headlines_articles.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/headlines_divider.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/loading_fragment.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/select_font_size_dialog.xml
 delete mode 100644 org.fox.ttrss/src/main/res/layout/share.xml
 delete mode 100755 org.fox.ttrss/src/main/res/layout/subscribe.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/toolbar.xml

(limited to 'org.fox.ttrss/src/main/res')

diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_headlines_articles.xml
new file mode 100644
index 00000000..0e904edc
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_headlines_articles.xml
@@ -0,0 +1,43 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines"
+    android:fitsSystemWindows="true"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+
+    <FrameLayout
+        android:id="@+id/sw600dp_anchor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" >
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="false"
+        android:orientation="horizontal" >
+
+        <FrameLayout
+            android:paddingRight="4dp"
+            android:id="@+id/headlines_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.3"
+            android:background="?headlinesBackground" >
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/article_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.7"
+            android:elevation="4dp"
+            android:background="?articleBackground" >
+        </FrameLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
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
old mode 100755
new mode 100644
index 88e84742..c89f3baa
--- 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-land/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
deleted file mode 100755
index 4067b7b4..00000000
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines"
-    android:fitsSystemWindows="true"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
-
-    <FrameLayout
-        android:id="@+id/sw600dp_anchor"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" >
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:baselineAligned="false"
-        android:orientation="horizontal" >
-
-        <FrameLayout
-            android:paddingRight="4dp"
-            android:id="@+id/headlines_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.3"
-            android:background="?headlinesBackground" >
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/article_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.7"
-            android:elevation="4dp"
-            android:background="?articleBackground" >
-        </FrameLayout>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_headlines_articles.xml
new file mode 100644
index 00000000..47c84639
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_headlines_articles.xml
@@ -0,0 +1,43 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines"
+    android:fitsSystemWindows="true"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar" />
+
+    <FrameLayout
+        android:id="@+id/sw600dp_anchor"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" >
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="false"
+        android:orientation="horizontal"
+        android:layout_below="@+id/toolbar">
+
+        <FrameLayout
+            android:paddingRight="4dp"
+            android:id="@+id/headlines_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.4"
+            android:background="?headlinesBackground" >
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/article_fragment"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.6"
+            android:elevation="4dp"
+            android:background="?articleBackground" >
+        </FrameLayout>
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
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/headlines_articles.xml
deleted file mode 100755
index 05e3fdda..00000000
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines"
-    android:fitsSystemWindows="true"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
-
-    <FrameLayout
-        android:id="@+id/sw600dp_anchor"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" >
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:baselineAligned="false"
-        android:orientation="horizontal"
-        android:layout_below="@+id/actionbar_toolbar">
-
-        <FrameLayout
-            android:paddingRight="4dp"
-            android:id="@+id/headlines_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4"
-            android:background="?headlinesBackground" >
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/article_fragment"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.6"
-            android:elevation="4dp"
-            android:background="?articleBackground" >
-        </FrameLayout>
-    </LinearLayout>
-
-</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/actionbar_toolbar.xml
deleted file mode 100644
index 85ebaeb2..00000000
--- a/org.fox.ttrss/src/main/res/layout/actionbar_toolbar.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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"
-    android:elevation="4dp"
-    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-    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.ttrss/src/main/res/layout/activity_headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml
new file mode 100644
index 00000000..e9cfdc35
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_headlines_articles.xml
@@ -0,0 +1,24 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines"
+    android:fitsSystemWindows="true"
+    android:animateLayoutChanges="true"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <FrameLayout
+        android:id="@+id/article_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?articleBackground">
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/headlines_fragment"
+        android:visibility="gone"
+        android:layout_height="0dp"
+        android:layout_width="0dp"
+        android:background="?headlinesBackground">
+    </FrameLayout>
+
+    <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/activity_share.xml b/org.fox.ttrss/src/main/res/layout/activity_share.xml
new file mode 100644
index 00000000..b2ae8d12
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_share.xml
@@ -0,0 +1,56 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="5dp" >
+
+    <EditText
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:ems="10"
+        android:hint="@string/share_title_hint"
+        android:singleLine="true" />
+
+    <EditText
+        android:id="@+id/url"
+        android:inputType="textUri"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/title"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/title"
+        android:ems="10"
+        android:hint="@string/share_url_hint"
+        android:singleLine="true" />
+
+
+    <EditText
+        android:id="@+id/content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignRight="@+id/url"
+        android:layout_below="@+id/url"
+        android:ems="10"
+        android:hint="@string/share_content_hint"
+        android:inputType="textMultiLine"
+        android:maxLines="3" >
+
+        <requestFocus />
+    </EditText>
+
+
+    <Button
+        android:id="@+id/share_button"
+        android:layout_width="100dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignRight="@+id/content"
+        android:layout_below="@+id/content"
+        android:text="@string/share_share_button" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/activity_subscribe.xml b/org.fox.ttrss/src/main/res/layout/activity_subscribe.xml
new file mode 100644
index 00000000..8027faf4
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/activity_subscribe.xml
@@ -0,0 +1,73 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:animateLayoutChanges="true"
+    android:padding="@dimen/activity_horizontal_margin" >
+
+    <EditText
+        android:id="@+id/feed_url"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:ems="10"
+        android:hint="@string/feed_url"
+        android:inputType="textUri"
+        android:maxLines="1" >
+
+        <requestFocus />
+    </EditText>
+
+    <Spinner
+        android:id="@+id/feed_spinner"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/feed_url"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/feed_url" />
+
+    <Spinner
+        android:id="@+id/category_spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/feed_spinner"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/feed_spinner" />
+
+    <ProgressBar
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_below="@+id/category_spinner"
+        android:layout_width="match_parent"
+        android:visibility="invisible"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:id="@+id/subscribe_progress" />
+
+    <LinearLayout
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/category_spinner"
+        android:layout_alignRight="@+id/category_spinner"
+        android:layout_below="@+id/subscribe_progress" >
+
+        <Button
+            style="?android:attr/buttonBarButtonStyle"
+            android:id="@+id/cats_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.5"
+            android:text="Update categories" />
+
+        <Button
+            style="?android:attr/buttonBarButtonStyle"
+            android:id="@+id/subscribe_button"
+		    android:layout_width="wrap_content"
+		    android:layout_weight="0.5"
+            android:layout_height="wrap_content"
+            android:text="@string/subscribe_to_feed" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/article_fragment.xml b/org.fox.ttrss/src/main/res/layout/article_fragment.xml
deleted file mode 100755
index 4a1709b4..00000000
--- a/org.fox.ttrss/src/main/res/layout/article_fragment.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/article_fragment"
-    android:layout_width="fill_parent"
-    android:layout_height="match_parent"
-    android:background="?articleBackground">
-
-
-    <FrameLayout
-        android:id="@+id/article_fullscreen_video"
-        android:visibility="invisible"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"></FrameLayout>
-
-    <org.fox.ttrss.util.NoChildFocusScrollView
-        android:id="@+id/article_scrollview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="false" >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-
-            <!-- hack for hiding actionbar on small devices -->
-            <FrameLayout
-                android:id="@+id/article_heading_spacer"
-                android:visibility="gone"
-                android:layout_marginTop="@dimen/abc_action_bar_default_height_material"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
-
-            <LinearLayout
-                android:padding="16dp"
-                android:id="@+id/article_header"
-                android:background="?articleHeader"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="6dp">
-
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <TextView
-                        android:id="@+id/title"
-                        android:background="@drawable/ripple"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="My simple but hilariously and excessively long  headline"
-                        android:textColor="?articleHeaderTextColor"
-                        android:textSize="18sp" />
-
-                    <ImageView
-                        android:id="@+id/share"
-                        android:background="@drawable/ripple"
-                        android:layout_width="wrap_content"
-                        android:layout_height="24dp"
-                        android:layout_weight="0"
-                        android:layout_marginLeft="8dp"
-                        android:clickable="true"
-                        android:src="?ic_share"
-                        android:layout_gravity="center_vertical|right" />
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/comments"
-                    android:background="@drawable/ripple"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:fontFamily="sans-serif-light"
-                    android:paddingTop="8dp"
-                    android:text="24 comments"
-                    android:textColor="?headlineSecondaryTextColor"
-                    android:textSize="12sp" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"                    
-                    android:paddingTop="8dp">
-
-                    <TextView
-                        android:id="@+id/tags"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:ellipsize="middle"
-                        android:singleLine="true"
-                        android:fontFamily="sans-serif-light"
-                        android:text="Example Feed"
-                        android:textColor="?headlineSecondaryTextColor"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:id="@+id/date"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="0"
-                        android:gravity="right"
-                        android:layout_marginLeft="10dp"
-                        android:fontFamily="sans-serif-light"
-                        android:text="Jan 01, 12:00"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="?headlineSecondaryTextColor"
-                        android:textSize="12sp" />
-
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <View
-                android:layout_gravity="top|center_horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?articleHeaderSeparator"/>
-
-            <TextView
-                android:id="@+id/note"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="?articleNoteBackground"
-                android:textColor="?articleNoteTextColor"
-                android:textSize="12sp"
-                android:text="[Article note]"
-                android:paddingLeft="16dp"
-                android:paddingTop="8dp"
-                android:paddingRight="16dp"
-                android:paddingBottom="8dp" />
-
-            <org.fox.ttrss.util.LessBrokenWebView
-                android:layout_margin="16dp"
-                android:id="@+id/article_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </LinearLayout>
-    </org.fox.ttrss.util.NoChildFocusScrollView>
-
-    <com.shamanland.fab.FloatingActionButton
-        android:id="@+id/article_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|right"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="20dp"
-        app:floatingActionButtonColor="?colorAccent"
-        android:src="@drawable/ic_action_web_site"
-        />
-
-</FrameLayout>
\ No newline at end of file
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/cats_fragment.xml b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml
deleted file mode 100755
index ff2e8307..00000000
--- a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/cats_fragment.xml"
-    android:layout_width="match_parent"
-    android:layout_height="fill_parent" >
-
-    <android.support.v4.widget.SwipeRefreshLayout
-    	android:id="@+id/feeds_swipe_container"
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent" >
-
-	    <ListView
-	        android:id="@+id/feeds"
-            android:dividerHeight="0dp"
-            android:divider="@null"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent" >
-	    </ListView>
-	</android.support.v4.widget.SwipeRefreshLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml b/org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml
new file mode 100644
index 00000000..f77cc151
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/dialog_select_font_size.xml
@@ -0,0 +1,22 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/text_progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dip"
+        android:gravity="center_horizontal" >
+    </TextView>
+
+    <SeekBar
+        android:id="@+id/seek_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="6dip"
+        android:layout_marginTop="6dip" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml
new file mode 100644
index 00000000..d47c3b5b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <View
+        android:layout_gravity="top|center_horizontal"
+        android:layout_marginTop="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?headlineFooterColor"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/dummy_fragment.xml b/org.fox.ttrss/src/main/res/layout/dummy_fragment.xml
deleted file mode 100644
index dd1e9876..00000000
--- a/org.fox.ttrss/src/main/res/layout/dummy_fragment.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dummy_fragment"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml
deleted file mode 100755
index eec49bc6..00000000
--- a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/feeds_fragment"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <android.support.v4.widget.SwipeRefreshLayout 
-    	android:id="@+id/feeds_swipe_container"
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent">
-
-        <ListView
-            android:id="@+id/feeds"
-            android:dividerHeight="0dp"
-            android:divider="@null"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true">
-        </ListView>
-    </android.support.v4.widget.SwipeRefreshLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
new file mode 100644
index 00000000..4a1709b4
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -0,0 +1,157 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/article_fragment"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:background="?articleBackground">
+
+
+    <FrameLayout
+        android:id="@+id/article_fullscreen_video"
+        android:visibility="invisible"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"></FrameLayout>
+
+    <org.fox.ttrss.util.NoChildFocusScrollView
+        android:id="@+id/article_scrollview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="false" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <!-- hack for hiding actionbar on small devices -->
+            <FrameLayout
+                android:id="@+id/article_heading_spacer"
+                android:visibility="gone"
+                android:layout_marginTop="@dimen/abc_action_bar_default_height_material"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+
+            <LinearLayout
+                android:padding="16dp"
+                android:id="@+id/article_header"
+                android:background="?articleHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="6dp">
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <TextView
+                        android:id="@+id/title"
+                        android:background="@drawable/ripple"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="My simple but hilariously and excessively long  headline"
+                        android:textColor="?articleHeaderTextColor"
+                        android:textSize="18sp" />
+
+                    <ImageView
+                        android:id="@+id/share"
+                        android:background="@drawable/ripple"
+                        android:layout_width="wrap_content"
+                        android:layout_height="24dp"
+                        android:layout_weight="0"
+                        android:layout_marginLeft="8dp"
+                        android:clickable="true"
+                        android:src="?ic_share"
+                        android:layout_gravity="center_vertical|right" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/comments"
+                    android:background="@drawable/ripple"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:fontFamily="sans-serif-light"
+                    android:paddingTop="8dp"
+                    android:text="24 comments"
+                    android:textColor="?headlineSecondaryTextColor"
+                    android:textSize="12sp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"                    
+                    android:paddingTop="8dp">
+
+                    <TextView
+                        android:id="@+id/tags"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:ellipsize="middle"
+                        android:singleLine="true"
+                        android:fontFamily="sans-serif-light"
+                        android:text="Example Feed"
+                        android:textColor="?headlineSecondaryTextColor"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/date"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="right"
+                        android:layout_marginLeft="10dp"
+                        android:fontFamily="sans-serif-light"
+                        android:text="Jan 01, 12:00"
+                        android:textAppearance="?android:attr/textAppearanceSmall"
+                        android:textColor="?headlineSecondaryTextColor"
+                        android:textSize="12sp" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <View
+                android:layout_gravity="top|center_horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="?articleHeaderSeparator"/>
+
+            <TextView
+                android:id="@+id/note"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="?articleNoteBackground"
+                android:textColor="?articleNoteTextColor"
+                android:textSize="12sp"
+                android:text="[Article note]"
+                android:paddingLeft="16dp"
+                android:paddingTop="8dp"
+                android:paddingRight="16dp"
+                android:paddingBottom="8dp" />
+
+            <org.fox.ttrss.util.LessBrokenWebView
+                android:layout_margin="16dp"
+                android:id="@+id/article_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+    </org.fox.ttrss.util.NoChildFocusScrollView>
+
+    <com.shamanland.fab.FloatingActionButton
+        android:id="@+id/article_fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|right"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="20dp"
+        app:floatingActionButtonColor="?colorAccent"
+        android:src="@drawable/ic_action_web_site"
+        />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml
new file mode 100644
index 00000000..ff2e8307
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/cats_fragment.xml"
+    android:layout_width="match_parent"
+    android:layout_height="fill_parent" >
+
+    <android.support.v4.widget.SwipeRefreshLayout
+    	android:id="@+id/feeds_swipe_container"
+    	android:layout_width="match_parent"
+    	android:layout_height="match_parent" >
+
+	    <ListView
+	        android:id="@+id/feeds"
+            android:dividerHeight="0dp"
+            android:divider="@null"
+	        android:layout_width="match_parent"
+	        android:layout_height="match_parent" >
+	    </ListView>
+	</android.support.v4.widget.SwipeRefreshLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_dummy.xml b/org.fox.ttrss/src/main/res/layout/fragment_dummy.xml
new file mode 100644
index 00000000..dd1e9876
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/fragment_dummy.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/dummy_fragment"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml
new file mode 100644
index 00000000..eec49bc6
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/feeds_fragment"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <android.support.v4.widget.SwipeRefreshLayout 
+    	android:id="@+id/feeds_swipe_container"
+    	android:layout_width="match_parent"
+    	android:layout_height="match_parent">
+
+        <ListView
+            android:id="@+id/feeds"
+            android:dividerHeight="0dp"
+            android:divider="@null"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true">
+        </ListView>
+    </android.support.v4.widget.SwipeRefreshLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
new file mode 100644
index 00000000..acddc7a8
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines_fragment"
+    android:background="?android:colorBackground"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <android.support.v4.widget.SwipeRefreshLayout 
+    	android:id="@+id/headlines_swipe_container"
+    	android:layout_width="match_parent"
+    	android:layout_height="match_parent" >
+    
+	   <ListView
+	       android:id="@+id/headlines_list"
+           android:drawSelectorOnTop="true"
+	       android:layout_width="match_parent"
+	       android:layout_height="match_parent" >
+	   </ListView>
+	</android.support.v4.widget.SwipeRefreshLayout>
+
+    <!-- <TextView
+        android:id="@+id/no_headlines"
+        android:clickable="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/no_headlines"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:visibility="invisible" >
+    </TextView> -->
+
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_loading.xml b/org.fox.ttrss/src/main/res/layout/fragment_loading.xml
new file mode 100644
index 00000000..b9b3e977
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/fragment_loading.xml
@@ -0,0 +1,14 @@
+
+    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" >
+
+
+        <ProgressBar
+            android:id="@+id/progress"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+    </FrameLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/headlines.xml
old mode 100755
new mode 100644
index 233a6a69..69ef2c15
--- 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/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
deleted file mode 100755
index de249cfb..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines"
-    android:fitsSystemWindows="true"
-    android:animateLayoutChanges="true"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <FrameLayout
-        android:id="@+id/article_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?articleBackground">
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/headlines_fragment"
-        android:visibility="gone"
-        android:layout_height="0dp"
-        android:layout_width="0dp"
-        android:background="?headlinesBackground">
-    </FrameLayout>
-
-    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_divider.xml b/org.fox.ttrss/src/main/res/layout/headlines_divider.xml
deleted file mode 100755
index 40294376..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines_divider.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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">
-
-    <View
-        android:layout_gravity="top|center_horizontal"
-        android:layout_marginTop="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="?headlineFooterColor"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
deleted file mode 100755
index acddc7a8..00000000
--- a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines_fragment"
-    android:background="?android:colorBackground"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <android.support.v4.widget.SwipeRefreshLayout 
-    	android:id="@+id/headlines_swipe_container"
-    	android:layout_width="match_parent"
-    	android:layout_height="match_parent" >
-    
-	   <ListView
-	       android:id="@+id/headlines_list"
-           android:drawSelectorOnTop="true"
-	       android:layout_width="match_parent"
-	       android:layout_height="match_parent" >
-	   </ListView>
-	</android.support.v4.widget.SwipeRefreshLayout>
-
-    <!-- <TextView
-        android:id="@+id/no_headlines"
-        android:clickable="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/no_headlines"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:visibility="invisible" >
-    </TextView> -->
-
-</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/loading_fragment.xml b/org.fox.ttrss/src/main/res/layout/loading_fragment.xml
deleted file mode 100644
index b9b3e977..00000000
--- a/org.fox.ttrss/src/main/res/layout/loading_fragment.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent" >
-
-
-        <ProgressBar
-            android:id="@+id/progress"
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center" />
-
-    </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/select_font_size_dialog.xml b/org.fox.ttrss/src/main/res/layout/select_font_size_dialog.xml
deleted file mode 100644
index f77cc151..00000000
--- a/org.fox.ttrss/src/main/res/layout/select_font_size_dialog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/text_progress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dip"
-        android:gravity="center_horizontal" >
-    </TextView>
-
-    <SeekBar
-        android:id="@+id/seek_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="6dip"
-        android:layout_marginTop="6dip" />
-
-</LinearLayout>
\ 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/share.xml
deleted file mode 100644
index b2ae8d12..00000000
--- a/org.fox.ttrss/src/main/res/layout/share.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="5dp" >
-
-    <EditText
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:ems="10"
-        android:hint="@string/share_title_hint"
-        android:singleLine="true" />
-
-    <EditText
-        android:id="@+id/url"
-        android:inputType="textUri"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/title"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/title"
-        android:ems="10"
-        android:hint="@string/share_url_hint"
-        android:singleLine="true" />
-
-
-    <EditText
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignRight="@+id/url"
-        android:layout_below="@+id/url"
-        android:ems="10"
-        android:hint="@string/share_content_hint"
-        android:inputType="textMultiLine"
-        android:maxLines="3" >
-
-        <requestFocus />
-    </EditText>
-
-
-    <Button
-        android:id="@+id/share_button"
-        android:layout_width="100dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignRight="@+id/content"
-        android:layout_below="@+id/content"
-        android:text="@string/share_share_button" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/subscribe.xml b/org.fox.ttrss/src/main/res/layout/subscribe.xml
deleted file mode 100755
index 8027faf4..00000000
--- a/org.fox.ttrss/src/main/res/layout/subscribe.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:animateLayoutChanges="true"
-    android:padding="@dimen/activity_horizontal_margin" >
-
-    <EditText
-        android:id="@+id/feed_url"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:ems="10"
-        android:hint="@string/feed_url"
-        android:inputType="textUri"
-        android:maxLines="1" >
-
-        <requestFocus />
-    </EditText>
-
-    <Spinner
-        android:id="@+id/feed_spinner"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/feed_url"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/feed_url" />
-
-    <Spinner
-        android:id="@+id/category_spinner"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/feed_spinner"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/feed_spinner" />
-
-    <ProgressBar
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_below="@+id/category_spinner"
-        android:layout_width="match_parent"
-        android:visibility="invisible"
-        android:layout_height="wrap_content"
-        android:indeterminate="true"
-        android:id="@+id/subscribe_progress" />
-
-    <LinearLayout
-        style="?android:attr/buttonBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/category_spinner"
-        android:layout_alignRight="@+id/category_spinner"
-        android:layout_below="@+id/subscribe_progress" >
-
-        <Button
-            style="?android:attr/buttonBarButtonStyle"
-            android:id="@+id/cats_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:text="Update categories" />
-
-        <Button
-            style="?android:attr/buttonBarButtonStyle"
-            android:id="@+id/subscribe_button"
-		    android:layout_width="wrap_content"
-		    android:layout_weight="0.5"
-            android:layout_height="wrap_content"
-            android:text="@string/subscribe_to_feed" />
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml
new file mode 100644
index 00000000..d8f9bfab
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/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/toolbar"
+    android:elevation="4dp"
+    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:minHeight="?attr/actionBarSize"
+    android:background="?attr/colorPrimary" />
\ No newline at end of file
-- 
cgit v1.2.3