Updated OnlineFeedView layout

1 files changed, 28 insertions, 71 deletions

diff --git a/app/src/main/res/layout/onlinefeedview_header.xml b/app/src/main/res/layout/onlinefeedview_header.xml
index 4217322e4..057bfb379 100644
--- a/app/src/main/res/layout/onlinefeedview_header.xml
+++ b/app/src/main/res/layout/onlinefeedview_header.xml
@@ -1,88 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout 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">
-
-    <ImageView
-        android:id="@+id/imgvCover"
-        android:layout_width="@dimen/thumbnail_length_onlinefeedview"
-        android:layout_height="@dimen/thumbnail_length_onlinefeedview"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="16dp"
-        android:contentDescription="@string/cover_label"
-        tools:src="@drawable/ic_stat_antenna_default"
-        tools:background="@android:color/holo_green_dark" />
-
-    <TextView
-        android:id="@+id/txtvTitle"
-        style="@style/AntennaPod.TextView.Heading"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginBottom="8dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_toRightOf="@id/imgvCover"
-        android:layout_toEndOf="@id/imgvCover"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:maxLines="2"
-        tools:text="Online feed title"
-        tools:background="@android:color/holo_green_dark" />
-
-    <TextView
-        android:id="@+id/txtvAuthor"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/txtvTitle"
-        android:layout_marginBottom="8dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_toRightOf="@id/imgvCover"
-        android:layout_toEndOf="@id/imgvCover"
-        android:ellipsize="end"
-        android:lines="1"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="@dimen/text_size_small"
-        tools:text="Online feed author"
-        tools:background="@android:color/holo_green_dark" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:orientation="vertical"
         android:layout_height="wrap_content"
-        android:layout_below="@id/imgvCover"
-        android:orientation="vertical">
+        android:layout_width="match_parent">
 
+    <include layout="@layout/feeditemlist_header"/>
 
-        <Spinner
+    <Spinner
             android:id="@+id/spinnerAlternateUrls"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
+            android:padding="8dp"
             android:textColor="?android:attr/textColorPrimary"
-            android:textSize="@dimen/text_size_micro" />
+            android:textSize="@dimen/text_size_micro"/>
 
-        <Button
+    <Button
             android:id="@+id/butSubscribe"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="16dp"
             android:focusable="false"
-            android:text="@string/subscribe_label" />
+            android:text="@string/subscribe_label"/>
 
-        <TextView
+    <TextView
             android:id="@+id/txtvDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -91,10 +36,22 @@
             android:layout_marginStart="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginEnd="16dp"
+            android:ellipsize="end"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="@dimen/text_size_small"
             tools:text="@string/design_time_lorem_ipsum"
             tools:background="@android:color/holo_green_dark"/>
 
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginEnd="16dp"
+            android:textColor="?attr/colorAccent"
+            android:textSize="@dimen/text_size_small"
+            android:text="@string/episodes_label"/>
+
+</LinearLayout>
\ No newline at end of file