Merge pull request #3923 from ByteHamster/toolbar

Moved Toolbar to individual Fragments

1 files changed, 87 insertions, 76 deletions

diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml
index 416fc3aec..05457d61b 100644
--- a/app/src/main/res/layout/feedinfo.xml
+++ b/app/src/main/res/layout/feedinfo.xml
@@ -1,132 +1,143 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <include layout="@layout/feeditemlist_header" />
-
-    <ScrollView
-        android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:scrollbarStyle="outsideOverlay"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:paddingBottom="8dp"
-        android:clipToPadding="false">
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent" android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <LinearLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:contentScrim="?attr/colorPrimary"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+            <ImageView
+                    android:id="@+id/imgvBackground"
+                    style="@style/BigBlurryBackground"
+                    android:layout_width="match_parent"
+                    android:layout_height="256dp"
+                    app:layout_collapseMode="parallax"
+                    app:layout_collapseParallaxMultiplier="0.6"/>
+
+            <include layout="@layout/feeditemlist_header"
+                     android:layout_width="match_parent"
+                     android:layout_height="wrap_content"
+                     android:layout_gravity="bottom"
+                     app:layout_collapseMode="parallax"
+                     app:layout_collapseParallaxMultiplier="0.6"/>
+
+            <androidx.appcompat.widget.Toolbar
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="?attr/actionBarSize"
+                    android:theme="?attr/actionBarTheme"
+                    app:navigationIcon="?homeAsUpIndicator"
+                    android:layout_alignParentTop="true"
+                    android:id="@+id/toolbar"
+                    app:layout_collapseMode="pin"/>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:scrollbarStyle="outsideOverlay"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="8dp"
+            android:clipToPadding="false"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <androidx.gridlayout.widget.GridLayout
+        <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:columnCount="2"
-                app:rowCount="3">
+                android:orientation="vertical">
 
-                <TextView
+            <TextView
+                    style="@style/AntennaPod.TextView.Heading"
                     android:id="@+id/lblAuthor"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginBottom="8dp"
-                    app:layout_row="0"
-                    app:layout_column="0"
-                    android:lines="1"
                     android:text="@string/author_label"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="8dp"
                     android:textColor="?android:attr/textColorPrimary"
                     tools:background="@android:color/holo_red_light"/>
 
-                <TextView
+            <TextView
                     android:id="@+id/txtvDetailsAuthor"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textIsSelectable="true"
-                    app:layout_row="0"
-                    app:layout_column="1"
                     tools:text="Daniel Oeh"
                     tools:background="@android:color/holo_green_dark"/>
 
-                <TextView
+            <TextView
+                    style="@style/AntennaPod.TextView.Heading"
                     android:id="@+id/lblLanguage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_marginTop="8dp"
                     android:layout_marginBottom="8dp"
-                    app:layout_row="1"
-                    app:layout_column="0"
-                    android:lines="1"
                     android:text="@string/language_label"
                     android:textColor="?android:attr/textColorPrimary"
                     tools:background="@android:color/holo_red_light"/>
 
-                <TextView
+            <TextView
                     android:id="@+id/txtvLanguage"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textIsSelectable="true"
-                    app:layout_row="1"
-                    app:layout_column="1"
                     tools:text="English"
                     tools:background="@android:color/holo_green_dark"/>
 
-                <TextView
+            <TextView
+                    style="@style/AntennaPod.TextView.Heading"
                     android:id="@+id/lblUrl"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="8dp"
-                    android:layout_marginEnd="8dp"
-                    app:layout_row="2"
-                    app:layout_column="0"
-                    android:lines="1"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginBottom="4dp"
                     android:text="@string/url_label"
                     android:textColor="?android:attr/textColorPrimary"
                     tools:background="@android:color/holo_red_light"/>
 
-                <TextView
+            <TextView
                     android:id="@+id/txtvUrl"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="4dp"
                     android:background="?attr/selectableItemBackground"
-                    app:layout_row="2"
-                    app:layout_column="1"
-                    app:layout_gravity="fill"
                     android:maxLines="4"
+                    android:paddingTop="4dp"
+                    android:paddingBottom="4dp"
                     tools:text="http://www.example.com/feed"
                     tools:background="@android:color/holo_green_dark"/>
 
-            </androidx.gridlayout.widget.GridLayout>
-
             <TextView
-                style="@style/AntennaPod.TextView.Heading"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/description_label"/>
+                    style="@style/AntennaPod.TextView.Heading"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginBottom="8dp"
+                    android:text="@string/description_label"/>
 
             <TextView
-                android:id="@+id/txtvDescription"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textIsSelectable="true"
-                android:text="@string/design_time_lorem_ipsum"
-                tools:background="@android:color/holo_green_dark"/>
+                    android:id="@+id/txtvDescription"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textIsSelectable="true"
+                    android:text="@string/design_time_lorem_ipsum"
+                    tools:background="@android:color/holo_green_dark"/>
 
         </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
-    </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>