From 839f09b06e9175397b8f241fed8f5005eb064dd8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 3 Oct 2020 09:01:59 +0300
Subject: move fab to activity view out of specific fragments

---
 .../src/main/res/layout/activity_detail.xml        |  8 +++----
 .../src/main/res/layout/activity_detail_phone.xml  | 11 ++++++++-
 .../src/main/res/layout/activity_master_phone.xml  | 27 ++++++++--------------
 .../src/main/res/layout/fragment_article.xml       | 12 +---------
 .../src/main/res/layout/fragment_headlines.xml     | 19 ++++-----------
 5 files changed, 29 insertions(+), 48 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail.xml b/org.fox.ttrss/src/main/res/layout/activity_detail.xml
index c35ab296..8f36bbd6 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_detail.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_detail.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+xmlns:android="http://schemas.android.com/apk/res/android"
+android:layout_width="match_parent"
+android:layout_height="match_parent">
 
-    <include layout="@layout/activity_detail_phone" />
+<include layout="@layout/activity_detail_phone" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml
index 157ad794..6d9a8dbd 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml
@@ -10,6 +10,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/detail_fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
+            android:visibility="gone"
+            android:src="@drawable/ic_action_web_site"
+            android:layout_margin="16dp" />
+
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -20,7 +29,7 @@
 
         <FrameLayout
             android:id="@+id/article_fragment"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            app:layout_behavior=".util.DetailActivityScrollingViewBehavior"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?articleBackground">
diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
index d63d9fb9..6ae5064f 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
@@ -10,6 +10,15 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/master_fab"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end|bottom"
+                android:visibility="gone"
+                android:src="@drawable/ic_refresh"
+                android:layout_margin="16dp" />
+
             <com.google.android.material.appbar.AppBarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -20,29 +29,13 @@
 
             <FrameLayout
                 android:id="@+id/headlines_fragment"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                app:layout_behavior=".util.FabAwareScrollingViewBehavior"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?headlinesBackground" />
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-        <!-- <FrameLayout
-            android:fitsSystemWindows="true"
-            android:animateLayoutChanges="true"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <FrameLayout
-                android:id="@+id/headlines_fragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?headlinesBackground" />
-
-            <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-
-        </FrameLayout> -->
-
         <org.fox.ttrss.util.ScrimInsetsFrameLayout
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/scrimInsetsFrameLayout"
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index d14f6d88..2226cffe 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -15,16 +15,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/article_fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_marginBottom="72dp"
-            android:layout_marginRight="16dp"
-            android:src="@drawable/ic_action_web_site"
-             />
-
         <com.google.android.material.appbar.AppBarLayout
             android:background="?articleHeader"
             android:elevation="0dp"
@@ -133,7 +123,7 @@
         <androidx.core.widget.NestedScrollView
             android:id="@+id/article_scrollview"
             android:scrollbars="vertical|horizontal"
-            app:layout_behavior=".util.FabAwareScrollingViewBehavior"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
index 647afce8..9f09290f 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/headlines_fragment"
-    android:background="?android:colorBackground"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+	android:id="@+id/headlines_fragment"
+	android:background="?android:colorBackground"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
     	android:id="@+id/headlines_swipe_container"
@@ -19,14 +18,4 @@
 	       android:layout_height="match_parent" />
 	</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-	<com.google.android.material.floatingactionbutton.FloatingActionButton
-		android:id="@+id/headlines_fab"
-		app:layout_anchor="@id/headlines_fragment"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="end|bottom"
-		android:src="@drawable/ic_refresh"
-		android:layout_marginBottom="72dp"
-		android:layout_marginRight="16dp" />
-
 </FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf