From 8f734737f0070835d0a4b6445351d9d14b97ba37 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 28 Feb 2017 12:13:29 +0100
Subject: [PATCH] fix bug and add footer cycle to channel

---
 .../org/schabi/newpipe/ChannelActivity.java   | 15 ++++--
 .../newpipe/info_list/InfoListAdapter.java    | 51 ++++++++++++++-----
 app/src/main/res/layout/pignate_footer.xml    | 15 ++++++
 3 files changed, 63 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/layout/pignate_footer.xml

diff --git a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
index 1a915633a..37ef28a13 100644
--- a/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ChannelActivity.java
@@ -95,6 +95,8 @@ public class ChannelActivity extends AppCompatActivity {
         recyclerView.setLayoutManager(layoutManager);
         header = getLayoutInflater().inflate(R.layout.channel_header, recyclerView, false);
         infoListAdapter.setHeader(header);
+        infoListAdapter.setFooter(
+                getLayoutInflater().inflate(R.layout.pignate_footer, recyclerView, false));
         recyclerView.setAdapter(infoListAdapter);
         infoListAdapter.setOnStreamInfoItemSelectedListener(
                 new InfoItemBuilder.OnInfoItemSelectedListener() {
@@ -236,16 +238,17 @@ public class ChannelActivity extends AppCompatActivity {
             //delete already displayed content
             progressBar.setVisibility(View.VISIBLE);
             infoListAdapter.clearSteamItemList();
+            pageNumber = 0;
+            subscriberLayout.setVisibility(View.GONE);
+            titleView.setText("");
+            getSupportActionBar().setTitle("");
             if (SDK_INT >= 21) {
                 channelBanner.setImageDrawable(getDrawable(R.drawable.channel_banner));
                 avatarView.setImageDrawable(getDrawable(R.drawable.buddy));
-                subscriberLayout.setVisibility(View.GONE);
-                titleView.setText("");
-                getSupportActionBar().setTitle("");
             }
+            infoListAdapter.showFooter(false);
         }
 
-
         Thread channelExtractorThread = new Thread(new Runnable() {
             Handler h = new Handler();
 
@@ -266,8 +269,12 @@ public class ChannelActivity extends AppCompatActivity {
                             isLoading = false;
                             if(!onlyVideos) {
                                 updateUi(info);
+                                infoListAdapter.showFooter(true);
                             }
                             hasNextPage = info.hasNextPage;
+                            if(!hasNextPage) {
+                                infoListAdapter.showFooter(false);
+                            }
                             addVideos(info);
                         }
                     });
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
index 81d28f753..d6f173350 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java
@@ -38,16 +38,23 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     private final InfoItemBuilder infoItemBuilder;
     private final List<InfoItem> infoItemList;
+    private boolean showFooter = false;
     private View header = null;
+    private View footer = null;
 
-    public class HeaderHolder extends RecyclerView.ViewHolder {
-        public HeaderHolder(View v) {
+    public class HFHolder extends RecyclerView.ViewHolder {
+        public HFHolder(View v) {
             super(v);
             view = v;
         }
         public View view;
     }
 
+    public void showFooter(boolean show) {
+        showFooter = show;
+        notifyDataSetChanged();
+    }
+
     public InfoListAdapter(Activity a, View rootView) {
         infoItemBuilder = new InfoItemBuilder(a, rootView);
         infoItemList = new Vector<>();
@@ -63,9 +70,9 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         infoItemBuilder.setOnChannelInfoItemSelectedListener(listener);
     }
 
-    public void addInfoItemList(List<InfoItem> videos) {
-        if(videos!= null) {
-            infoItemList.addAll(videos);
+    public void addInfoItemList(List<InfoItem> data) {
+        if(data != null) {
+            infoItemList.addAll(data);
             notifyDataSetChanged();
         }
     }
@@ -77,11 +84,20 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
     public void setHeader(View header) {
         this.header = header;
+        notifyDataSetChanged();
+    }
+
+    public void setFooter(View view) {
+        this.footer = view;
+        notifyDataSetChanged();
     }
 
     @Override
     public int getItemCount() {
-        return (header == null) ? infoItemList.size() : (infoItemList.size() + 1);
+        int cound = infoItemList.size();
+        if(header != null) cound++;
+        if(footer != null && showFooter) cound++;
+        return cound;
     }
 
     // don't ask why we have to do that this way... it's android accept it -.-
@@ -92,13 +108,16 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
         } else if(header != null) {
             position--;
         }
+        if(footer != null && position == infoItemList.size() && showFooter) {
+            return 1;
+        }
         switch(infoItemList.get(position).infoType()) {
             case STREAM:
-                return 1;
-            case CHANNEL:
                 return 2;
-            case PLAYLIST:
+            case CHANNEL:
                 return 3;
+            case PLAYLIST:
+                return 4;
             default:
                 Log.e(TAG, "Trollolo");
                 return -1;
@@ -109,14 +128,16 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) {
         switch(type) {
             case 0:
-                return new HeaderHolder(header);
+                return new HFHolder(header);
             case 1:
+                return new HFHolder(footer);
+            case 2:
                 return new StreamInfoItemHolder(LayoutInflater.from(parent.getContext())
                         .inflate(R.layout.stream_item, parent, false));
-            case 2:
+            case 3:
                 return new ChannelInfoItemHolder(LayoutInflater.from(parent.getContext())
                         .inflate(R.layout.channel_item, parent, false));
-            case 3:
+            case 4:
                 Log.e(TAG, "Playlist is not yet implemented");
                 return null;
             default:
@@ -133,8 +154,10 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 i--;
             }
             infoItemBuilder.buildByHolder((InfoItemHolder) holder, infoItemList.get(i));
-        } else if(holder instanceof HeaderHolder && i == 0 && header != null) {
-            ((HeaderHolder) holder).view = header;
+        } else if(holder instanceof HFHolder && i == 0 && header != null) {
+            ((HFHolder) holder).view = header;
+        } else if(holder instanceof HFHolder && i == infoItemList.size() && footer != null && showFooter) {
+            ((HFHolder) holder).view = footer;
         }
     }
 }
diff --git a/app/src/main/res/layout/pignate_footer.xml b/app/src/main/res/layout/pignate_footer.xml
new file mode 100644
index 000000000..ea4592179
--- /dev/null
+++ b/app/src/main/res/layout/pignate_footer.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/paginate_progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingBottom="10dp"/>
+
+</LinearLayout>
\ No newline at end of file