From c54d13e072968fe74f0e3c43ec664a12b115bdfa Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 4 Jun 2015 00:30:35 +0300
Subject: move to v7 toolbar widget instead of old-style actionbar

---
 .../src/main/res/layout/actionbar_toolbar.xml        | 12 ++++++++++++
 .../src/main/res/layout/article_images_pager.xml     | 12 +++++-------
 org.fox.ttrss/src/main/res/layout/feeds_goback.xml   |  6 +++---
 org.fox.ttrss/src/main/res/layout/headlines.xml      | 16 +++++++++++++---
 .../src/main/res/layout/headlines_articles.xml       |  2 ++
 org.fox.ttrss/src/main/res/layout/login.xml          | 12 ++++++------
 org.fox.ttrss/src/main/res/layout/preferences.xml    | 20 ++++++++++++++++----
 7 files changed, 57 insertions(+), 23 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/layout/actionbar_toolbar.xml

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

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
-- 
cgit v1.2.3