move to v7 toolbar widget instead of old-style actionbar

22 files changed, 99 insertions, 48 deletions

diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_keyboard_backspace.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_keyboard_backspace.png
new file mode 100644
index 00000000..87546b16
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_keyboard_backspace.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_keyboard_backspace_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_keyboard_backspace_dark.png
new file mode 100644
index 00000000..47bad220
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_keyboard_backspace_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_keyboard_backspace.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_keyboard_backspace.png
new file mode 100644
index 00000000..c2908bf9
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_keyboard_backspace.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_keyboard_backspace_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_keyboard_backspace_dark.png
new file mode 100644
index 00000000..1722a89d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_keyboard_backspace_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_keyboard_backspace.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_keyboard_backspace.png
new file mode 100644
index 00000000..a50c2293
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_keyboard_backspace.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_keyboard_backspace_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_keyboard_backspace_dark.png
new file mode 100644
index 00000000..9b7980d6
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_keyboard_backspace_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_keyboard_backspace.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_keyboard_backspace.png
new file mode 100644
index 00000000..beb70fa1
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_keyboard_backspace.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_keyboard_backspace_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_keyboard_backspace_dark.png
new file mode 100644
index 00000000..5b875c1f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_keyboard_backspace_dark.png
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 ad4bd653..9c4b76f1 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
@@ -1,16 +1,23 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main"
     android:fitsSystemWindows="true"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent">
+
+    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:layout_below="@+id/actionbar_toolbar">
 
     <FrameLayout
         android:id="@+id/sw600dp_anchor"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone" >
-
     </FrameLayout>
 
     <LinearLayout
@@ -38,4 +45,5 @@
         </FrameLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
+</RelativeLayout>
\ No newline at end of file
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
index f4ff2c59..008efa4c 100755
--- 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
@@ -5,6 +5,8 @@
     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"
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
index f4ff2c59..02b42c10 100644
--- 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
@@ -1,9 +1,9 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    android:orientation="vertical" >
+    android:layout_height="fill_parent">
+
+    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
 
     <FrameLayout
         android:id="@+id/sw600dp_anchor"
@@ -17,7 +17,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:baselineAligned="false"
-        android:orientation="horizontal" >
+        android:orientation="horizontal"
+        android:layout_below="@+id/actionbar_toolbar">
 
         <FrameLayout
             android:paddingRight="4dp"
@@ -38,4 +39,4 @@
         </FrameLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</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
new file mode 100644
index 00000000..85ebaeb2
--- /dev/null
+++ b/org.fox.ttrss/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"
+    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/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
index 93b7eec3..250bd084 100644
--- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
+++ b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
@@ -1,19 +1,17 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/article_images"
     android:layout_width="fill_parent"
+    android:animateLayoutChanges="true"
     android:background="?headlinesBackground"
     android:layout_height="fill_parent">
-/*
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"> */
+
+    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
 
     <org.fox.ttrss.ArticleImagesPager
         android:id="@+id/article_images_pager"
-        android:layout_alignParentTop="true"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent" />
+        android:layout_height="fill_parent"
+        android:layout_below="@+id/actionbar_toolbar" />
 
     <ProgressBar
         style="?android:attr/progressBarStyleHorizontal"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
index 86e87263..e36a6b88 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
@@ -19,8 +19,8 @@
         android:layout_height="21dp"
         android:layout_weight="0"
         android:scaleType="fitXY"
-        android:visibility="invisible"
-        android:src="?ic_rss_box" />
+        android:tint="?colorAccent"
+        android:src="?ic_keyboard_backspace" />
 
     <TextView
         android:fontFamily="sans-serif-medium"
@@ -29,7 +29,7 @@
         android:gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
-        android:paddingLeft="30dp"
+        android:paddingLeft="35dp"
         android:singleLine="true"
         android:text=".."
         android:paddingBottom="2dp"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/headlines.xml
index f1865cd3..ece728ef 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines.xml
@@ -8,10 +8,20 @@
         android:layout_height="match_parent">
 
         <FrameLayout
-            android:id="@+id/headlines_fragment"
+            android:animateLayoutChanges="true"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?headlinesBackground"></FrameLayout>
+            android:layout_height="match_parent">
+
+            <FrameLayout
+                android:id="@+id/headlines_fragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="?headlinesBackground"></FrameLayout>
+
+            <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+
+        </FrameLayout>
+
 
         <FrameLayout
             android:id="@+id/feeds_fragment"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
index ccd2fcf3..146ea3e9 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
@@ -1,5 +1,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/headlines"
+    android:animateLayoutChanges="true"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
@@ -18,4 +19,5 @@
         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/login.xml b/org.fox.ttrss/src/main/res/layout/login.xml
index 2cfc44b1..f64a14f1 100644
--- a/org.fox.ttrss/src/main/res/layout/login.xml
+++ b/org.fox.ttrss/src/main/res/layout/login.xml
@@ -1,15 +1,15 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/loading_container"
     android:layout_width="fill_parent"
-    android:fitsSystemWindows="true"
-    android:gravity="center"
     android:layout_height="fill_parent" >
 
+    <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" />
+
         <TextView
             android:id="@+id/loading_message"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
+            android:layout_height="match_parent"
+            android:gravity="center"
             android:text="@string/loading_message" />
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/preferences.xml b/org.fox.ttrss/src/main/res/layout/preferences.xml
index e68fa9e4..55015d09 100644
--- a/org.fox.ttrss/src/main/res/layout/preferences.xml
+++ b/org.fox.ttrss/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.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml
index 76ef4cbf..3ebfade5 100755
--- a/org.fox.ttrss/src/main/res/menu/main_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml
@@ -6,8 +6,8 @@
             <item
                 android:id="@+id/subscribe_to_feed"
                 android:icon="@drawable/ic_plus_circle"
-                app:showAsAction="ifRoom"
-                android:title="@string/subscribe_to_feed"/>
+                app:showAsAction=""
+                android:title="@string/subscribe_to_feed"/> <!-- iRroom -->
 
             <item
                 android:id="@+id/show_feeds"
@@ -17,25 +17,27 @@
             <item
                 android:id="@+id/go_offline"
                 android:icon="@drawable/ic_cloud_download"
-                app:showAsAction="ifRoom"
-                android:title="@string/go_offline"/>            
-            <item
+                android:orderInCategory="800"
+                app:showAsAction=""
+                android:title="@string/go_offline"/> <!-- iRroom -->
+            <!-- <item
                 android:id="@+id/update_feeds"
                 android:icon="@drawable/ic_refresh"
                 app:showAsAction=""
-                android:title="@string/update_feeds"/>
+                android:title="@string/update_feeds"/> -->
             <item
+                android:orderInCategory="900"
                 android:id="@+id/logout"
                 android:icon="@drawable/ic_logout"
                 app:showAsAction=""
                 android:title="@string/logout"/>
         </group>
         <group android:id="@+id/menu_group_headlines" >
-            <item
+            <!-- <item
                 android:id="@+id/update_headlines"
                 android:icon="@drawable/ic_refresh"
                 app:showAsAction=""
-                android:title="@string/update_headlines"/>
+                android:title="@string/update_headlines"/> -->
             <item
                 android:id="@+id/search"
                 android:icon="@drawable/ic_magnify"
@@ -114,6 +116,7 @@
     </group>
 
     <item
+        android:orderInCategory="999"
         android:id="@+id/preferences"
         android:icon="@drawable/ic_settings"
         app:showAsAction=""
diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
index 42c94acc..f51521b7 100755
--- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
@@ -4,9 +4,9 @@
         <item
             android:id="@+id/go_online"
             android:icon="@drawable/ic_cloud_upload"
-            app:showAsAction="ifRoom|withText"
+            app:showAsAction=""
             android:title="@string/go_online"
-            android:visible="false"/>
+            android:visible="false"/> <!-- ifRoom|withText -->
         <item
             android:id="@+id/show_feeds"
             android:icon="@drawable/ic_filter_remove"
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index da0cf282..68278455 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -35,4 +35,5 @@
     <attr name="ic_star" format="reference" />
     <attr name="ic_star_outline" format="reference" />
     <attr name="ic_share" format="reference" />
+    <attr name="ic_keyboard_backspace" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 4f343839..ffe02dc8 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -1,7 +1,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="LightTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="windowActionBarOverlay">true</item>
+    <style name="LightTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="windowActionModeOverlay">true</item>
 
         <item name="statusBarHintColor">?colorPrimary</item>
         <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
@@ -43,10 +43,11 @@
         <item name="ic_star">@drawable/ic_star_dark</item>
         <item name="ic_star_outline">@drawable/ic_star_outline_dark</item>
         <item name="ic_share">@drawable/ic_share_dark</item>
+        <item name="ic_keyboard_backspace">@drawable/ic_keyboard_backspace_dark</item>
     </style>
 
-    <style name="DarkTheme" parent="Theme.AppCompat">
-        <item name="windowActionBarOverlay">true</item>
+    <style name="DarkTheme" parent="Theme.AppCompat.NoActionBar">
+        <item name="windowActionModeOverlay">true</item>
 
         <item name="statusBarHintColor">?colorPrimary</item>
         <item name="unreadCounterColor">#909090</item>
@@ -88,6 +89,7 @@
         <item name="ic_star">@drawable/ic_star</item>
         <item name="ic_star_outline">@drawable/ic_star_outline</item>
         <item name="ic_share">@drawable/ic_share</item>
+        <item name="ic_keyboard_backspace">@drawable/ic_keyboard_backspace</item>
     </style>
 
     <style name="DarkDialogTheme" parent="android:Theme"></style>