From c661be344e36815acdef8c0644f2788d2b72d059 Mon Sep 17 00:00:00 2001
From: Jatin Kumar <jatinkumarg17@gmail.com>
Date: Mon, 1 Apr 2019 20:40:58 -0400
Subject: [PATCH] Added include to the queue and episode layout

---
 .../fragment/AllEpisodesFragment.java         | 16 ++++----
 .../fragment/FavoriteEpisodesFragment.java    |  4 +-
 .../fragment/NewEpisodesFragment.java         |  4 +-
 .../antennapod/fragment/QueueFragment.java    | 15 ++++----
 .../main/res/layout/all_episodes_fragment.xml | 37 ++-----------------
 app/src/main/res/layout/queue_fragment.xml    | 36 ++----------------
 6 files changed, 27 insertions(+), 85 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
index 8d18e29e9..58d3861bf 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AllEpisodesFragment.java
@@ -19,8 +19,8 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.yqritc.recyclerviewflexibledivider.HorizontalDividerItemDecoration;
@@ -75,7 +75,7 @@ public class AllEpisodesFragment extends Fragment {
     RecyclerView recyclerView;
     AllEpisodesRecycleAdapter listAdapter;
     private ProgressBar progLoading;
-    private LinearLayout layoutEmpty;
+    private View emptyView;
 
     List<FeedItem> episodes;
     private List<Downloader> downloaderList;
@@ -333,8 +333,10 @@ public class AllEpisodesFragment extends Fragment {
             onFragmentLoaded();
         }
 
-        layoutEmpty = (LinearLayout) root.findViewById(R.id.llEmpty);
-        layoutEmpty.setVisibility(View.GONE);
+        emptyView = (View) root.findViewById(R.id.emptyView);
+        emptyView.setVisibility(View.GONE);
+        ((TextView)emptyView.findViewById(R.id.txtvtitle)).setText(R.string.no_all_episodes_head_label);
+        ((TextView)emptyView.findViewById(R.id.txtvmessage)).setText(R.string.no_all_episodes_label);
 
         return root;
     }
@@ -349,9 +351,9 @@ public class AllEpisodesFragment extends Fragment {
         }
         if (episodes == null || episodes.size() == 0) {
             recyclerView.setVisibility(View.GONE);
-            layoutEmpty.setVisibility(View.VISIBLE);
+            emptyView.setVisibility(View.VISIBLE);
         } else {
-            layoutEmpty.setVisibility(View.GONE);
+            emptyView.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
         }
 
@@ -486,7 +488,7 @@ public class AllEpisodesFragment extends Fragment {
         }
         if (viewsCreated && !itemsLoaded) {
             recyclerView.setVisibility(View.GONE);
-            layoutEmpty.setVisibility(View.GONE);
+            emptyView.setVisibility(View.GONE);
             progLoading.setVisibility(View.VISIBLE);
         }
         disposable = Observable.fromCallable(this::loadData)
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
index 5f4d0e882..ed6c57f64 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java
@@ -51,8 +51,8 @@ public class FavoriteEpisodesFragment extends AllEpisodesFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = super.onCreateViewHelper(inflater, container, savedInstanceState,
                 R.layout.all_episodes_fragment);
-        ((TextView)root.findViewById(R.id.emptyHeader)).setText(R.string.no_fav_episodes_head_label);
-        ((TextView)root.findViewById(R.id.empty)).setText(R.string.no_fav_episodes_label);
+        ((TextView)root.findViewById(R.id.txtvtitle)).setText(R.string.no_fav_episodes_head_label);
+        ((TextView)root.findViewById(R.id.txtvmessage)).setText(R.string.no_fav_episodes_label);
 
         ItemTouchHelper.SimpleCallback simpleItemTouchCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index 0808caa0c..6dc01aa14 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -46,8 +46,8 @@ public class NewEpisodesFragment extends AllEpisodesFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = super.onCreateViewHelper(inflater, container, savedInstanceState,
                 R.layout.all_episodes_fragment);
-        ((TextView)root.findViewById(R.id.emptyHeader)).setText(R.string.no_new_episodes_head_label);
-        ((TextView)root.findViewById(R.id.empty)).setText(R.string.no_new_episodes_label);
+        ((TextView)root.findViewById(R.id.txtvtitle)).setText(R.string.no_new_episodes_head_label);
+        ((TextView)root.findViewById(R.id.txtvmessage)).setText(R.string.no_new_episodes_label);
 
         ItemTouchHelper.SimpleCallback simpleItemTouchCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
             @Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
index 2125fe4a2..07693a87f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
@@ -19,7 +19,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -73,7 +72,7 @@ public class QueueFragment extends Fragment {
     private TextView infoBar;
     private RecyclerView recyclerView;
     private QueueRecyclerAdapter recyclerAdapter;
-    private LinearLayout layoutEmpty;
+    private View emptyView;
     private ProgressBar progLoading;
 
     private List<FeedItem> queue;
@@ -495,8 +494,10 @@ public class QueueFragment extends Fragment {
         );
         itemTouchHelper.attachToRecyclerView(recyclerView);
         //empty view
-        layoutEmpty = (LinearLayout) root.findViewById(R.id.llEmpty);
-        layoutEmpty.setVisibility(View.GONE);
+        emptyView = (View) root.findViewById(R.id.emptyView);
+        emptyView.setVisibility(View.GONE);
+        ((TextView)emptyView.findViewById(R.id.txtvtitle)).setText(R.string.no_items_header_label);
+        ((TextView)emptyView.findViewById(R.id.txtvmessage)).setText(R.string.no_items_label);
 
         progLoading = root.findViewById(R.id.progLoading);
         progLoading.setVisibility(View.VISIBLE);
@@ -514,9 +515,9 @@ public class QueueFragment extends Fragment {
         }
         if(queue == null || queue.size() == 0) {
             recyclerView.setVisibility(View.GONE);
-            layoutEmpty.setVisibility(View.VISIBLE);
+            emptyView.setVisibility(View.VISIBLE);
         } else {
-            layoutEmpty.setVisibility(View.GONE);
+            emptyView.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
         }
 
@@ -630,7 +631,7 @@ public class QueueFragment extends Fragment {
         }
         if (queue == null) {
             recyclerView.setVisibility(View.GONE);
-            layoutEmpty.setVisibility(View.GONE);
+            emptyView.setVisibility(View.GONE);
             progLoading.setVisibility(View.VISIBLE);
         }
         disposable = Observable.fromCallable(DBReader::getQueue)
diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml
index 0ce509ac4..099216007 100644
--- a/app/src/main/res/layout/all_episodes_fragment.xml
+++ b/app/src/main/res/layout/all_episodes_fragment.xml
@@ -17,40 +17,9 @@
         tools:itemCount="13"
         tools:listitem="@layout/new_episodes_listitem" />
 
-    <LinearLayout
-        android:id="@+id/llEmpty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center">
-
-        <TextView
-            android:id="@+id/emptyHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:gravity="center"
-            android:text="@string/no_all_episodes_head_label"
-            android:paddingBottom="15dp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:textSize="20sp"
-            android:textStyle="bold"
-            />
-
-        <TextView
-            android:id="@+id/empty"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:gravity="center"
-            android:text="@string/no_all_episodes_label"
-            android:textSize="15sp"
-            android:paddingLeft="10dp"
-            android:paddingRight="10dp"
-            android:textAlignment="center"/>
-
-    </LinearLayout>
+    <include
+        android:id="@+id/emptyView"
+        layout="@layout/empty_view_layout"/>
 
     <ProgressBar
         android:id="@+id/progLoading"
diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml
index c367c6ac7..cf00f2b1b 100644
--- a/app/src/main/res/layout/queue_fragment.xml
+++ b/app/src/main/res/layout/queue_fragment.xml
@@ -27,40 +27,10 @@
         android:layout_below="@id/divider"
         android:scrollbars="vertical"/>
 
-    <LinearLayout
-        android:id="@+id/llEmpty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center">
+    <include
+        android:id="@+id/emptyView"
+        layout="@layout/empty_view_layout"/>
 
-    <TextView
-        android:id="@+id/emptyQueueHeader"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
-        android:text="@string/no_items_header_label"
-        android:paddingBottom="15dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:textSize="20sp"
-        android:textStyle="bold"
-        />
-
-    <TextView
-        android:id="@+id/empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
-        android:text="@string/no_items_label"
-        android:textSize="15sp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:textAlignment="center"/>
-
-    </LinearLayout>
     <ProgressBar
         android:id="@+id/progLoading"
         android:layout_width="wrap_content"