Merge branch 'master' into develop

1 files changed, 39 insertions, 30 deletions

diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml
index 28321e760..443f19835 100644
--- a/app/src/main/res/layout/cover_fragment.xml
+++ b/app/src/main/res/layout/cover_fragment.xml
@@ -1,49 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
+    android:orientation="horizontal"
+    android:id="@+id/cover_fragment"
     android:padding="8dp"
     android:gravity="center">
 
     <de.danoeh.antennapod.view.SquareImageView
         android:id="@+id/imgvCover"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:layout_marginLeft="32dp"
-        android:layout_marginRight="32dp"
-        android:transitionName="coverTransition"
-        tools:src="@android:drawable/sym_def_app_icon"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_gravity="center"
+        android:layout_marginLeft="64dp"
+        android:layout_marginRight="64dp"
+        android:layout_weight="0"
         android:foreground="?attr/selectableItemBackgroundBorderless"
         android:importantForAccessibility="no"
-        squareImageView:direction="minimum" />
+        android:scaleType="fitCenter"
+        squareImageView:direction="height"
+        tools:src="@android:drawable/sym_def_app_icon" />
 
-    <TextView
-        android:id="@+id/txtvPodcastTitle"
+    <LinearLayout
+        android:id="@+id/cover_fragment_text_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="2"
+        android:orientation="vertical"
         android:layout_marginTop="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textIsSelectable="true"
-        tools:text="Podcast" />
+        android:layout_marginBottom="8dp">
 
-    <TextView
-        android:id="@+id/txtvEpisodeTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="2"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textIsSelectable="true"
-        android:layout_marginBottom="8dp"
-        tools:text="Episode" />
+        <TextView
+            android:id="@+id/txtvPodcastTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="2"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textIsSelectable="true"
+            tools:text="Podcast" />
+
+        <TextView
+            android:id="@+id/txtvEpisodeTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="2"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textIsSelectable="true"
+            tools:text="Episode" />
+    </LinearLayout>
 
 </LinearLayout>