Merge pull request #1751 from mfietz/issue/1727-podcast-title

Episode view: Show podcast title

2 files changed, 19 insertions, 6 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index 1382929af..0f5aa06ca 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -102,6 +102,7 @@ public class ItemFragment extends Fragment {
 
     private ViewGroup root;
     private WebView webvDescription;
+    private TextView txtvPodcast;
     private TextView txtvTitle;
     private TextView txtvDuration;
     private TextView txtvPublished;
@@ -135,6 +136,7 @@ public class ItemFragment extends Fragment {
         View layout = inflater.inflate(R.layout.feeditem_fragment, container, false);
 
         root = (ViewGroup) layout.findViewById(R.id.content_root);
+        txtvPodcast = (TextView) layout.findViewById(R.id.txtvPodcast);
         txtvTitle = (TextView) layout.findViewById(R.id.txtvTitle);
         txtvDuration = (TextView) layout.findViewById(R.id.txtvDuration);
         txtvPublished = (TextView) layout.findViewById(R.id.txtvPublished);
@@ -219,6 +221,7 @@ public class ItemFragment extends Fragment {
         EventDistributor.getInstance().register(contentUpdate);
         EventBus.getDefault().registerSticky(this);
         if(itemsLoaded) {
+            progbarLoading.setVisibility(View.GONE);
             updateAppearance();
         }
     }
@@ -295,6 +298,7 @@ public class ItemFragment extends Fragment {
             return;
         }
         getActivity().supportInvalidateOptionsMenu();
+        txtvPodcast.setText(item.getFeed().getTitle());
         txtvTitle.setText(item.getTitle());
 
         if (item.getPubDate() != null) {
diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index c18e5fd6c..a6ce221db 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -31,24 +31,34 @@
                 android:layout_alignParentStart="true"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginBottom="16dp"
                 android:contentDescription="@string/cover_label"
                 android:gravity="center_vertical"
                 tools:src="@drawable/ic_stat_antenna_default"
                 tools:background="@android:color/holo_green_dark" />
 
             <TextView
-                android:id="@+id/txtvTitle"
+                android:id="@+id/txtvPodcast"
+                style="@style/AntennaPod.TextView.ListItemSecondaryTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
                 android:layout_alignTop="@id/imgvCover"
                 android:layout_toRightOf="@id/imgvCover"
-                android:includeFontPadding="false"
+                tools:text="Podcast title"
+                tools:background="@android:color/holo_green_dark" />
+
+            <TextView
+                android:id="@+id/txtvTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/txtvPodcast"
+                android:layout_toRightOf="@id/imgvCover"
                 android:textSize="16sp"
                 android:textColor="?android:attr/textColorPrimary"
                 android:ellipsize="end"
                 android:maxLines="5"
-                tools:text="Podcast title"
+                tools:text="Episode title"
                 tools:background="@android:color/holo_green_dark" />
 
             <TextView
@@ -58,7 +68,6 @@
                 android:layout_height="wrap_content"
                 android:layout_toRightOf="@id/imgvCover"
                 android:layout_below="@id/txtvTitle"
-                android:layout_marginLeft="16dp"
                 tools:text="00:42:23"
                 tools:background="@android:color/holo_green_dark"/>
 
@@ -70,7 +79,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_below="@id/txtvTitle"
                 android:layout_marginLeft="8dp"
-                tools:text="Jan\n23"
+                tools:text="Jan 23"
                 tools:background="@android:color/holo_green_dark" />
 
         </RelativeLayout>