From efabce59676a4a60ee2b0c93fd5d3327a05f1e2b Mon Sep 17 00:00:00 2001
From: Relwi <theofficialdork@hotmail.com>
Date: Thu, 17 Mar 2022 18:08:23 +0100
Subject: [PATCH] Add pull down to refresh in subscriptions tab

Added the SwipeRefreshLayout in the fragment_subscriptions.xml to
refresh the content when user pulls down.

I keep the when user click in the tab it refresh the feed, because
I don't know which UX do you prefer.
---
 .../com/github/libretube/Subscriptions.kt     | 20 +++++-
 .../res/layout/fragment_subscriptions.xml     | 65 +++++++++++--------
 2 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/com/github/libretube/Subscriptions.kt b/app/src/main/java/com/github/libretube/Subscriptions.kt
index 9262fc45e..c01b5b85f 100644
--- a/app/src/main/java/com/github/libretube/Subscriptions.kt
+++ b/app/src/main/java/com/github/libretube/Subscriptions.kt
@@ -14,6 +14,7 @@ import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.adapters.SubscriptionAdapter
 import com.github.libretube.adapters.SubscriptionChannelAdapter
 import com.github.libretube.adapters.TrendingAdapter
@@ -25,6 +26,7 @@ class Subscriptions : Fragment() {
     lateinit var token: String
     var isLoaded = false
     private var subscriptionAdapter: SubscriptionAdapter? =null
+    private var refreshLayout: SwipeRefreshLayout? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
@@ -44,8 +46,11 @@ class Subscriptions : Fragment() {
         val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
         token = sharedPref?.getString("token","")!!
         Log.e(TAG,token)
+        refreshLayout = view.findViewById(R.id.sub_refresh)
         if(token!=""){
             view.findViewById<RelativeLayout>(R.id.loginOrRegister).visibility=View.GONE
+            refreshLayout?.isEnabled = true
+
             var progressBar = view.findViewById<ProgressBar>(R.id.sub_progress)
             progressBar.visibility=View.VISIBLE
 
@@ -57,6 +62,11 @@ class Subscriptions : Fragment() {
             feedRecView.layoutManager = GridLayoutManager(view.context, resources.getInteger(R.integer.grid_items))
             fetchFeed(feedRecView, progressBar)
 
+            refreshLayout?.setOnRefreshListener {
+                fetchChannels(channelRecView)
+                fetchFeed(feedRecView, progressBar)
+            }
+
             val scrollView = view.findViewById<ScrollView>(R.id.scrollview_sub)
             scrollView.viewTreeObserver
                 .addOnScrollChangedListener {
@@ -64,11 +74,15 @@ class Subscriptions : Fragment() {
                         == (scrollView.height + scrollView.scrollY)) {
                         //scroll view is at bottom
                         if(isLoaded){
+                            refreshLayout?.isRefreshing = true
                             subscriptionAdapter?.updateItems()
+                            refreshLayout?.isRefreshing = false
                         }
 
                     }
                 }
+        } else {
+            refreshLayout?.isEnabled = false
         }
     }
 
@@ -84,6 +98,8 @@ class Subscriptions : Fragment() {
                 } catch (e: HttpException) {
                     Log.e(TAG, "HttpException, unexpected response")
                     return@launchWhenCreated
+                } finally {
+                    refreshLayout?.isRefreshing = false
                 }
                 if (response.isNotEmpty()){
                     subscriptionAdapter = SubscriptionAdapter(response)
@@ -109,6 +125,8 @@ class Subscriptions : Fragment() {
                 } catch (e: HttpException) {
                     Log.e(TAG, "HttpException, unexpected response")
                     return@launchWhenCreated
+                } finally {
+                    refreshLayout?.isRefreshing = false
                 }
                 if (response.isNotEmpty()){
                     channelRecView?.adapter=SubscriptionChannelAdapter(response.toMutableList())
@@ -131,4 +149,4 @@ class Subscriptions : Fragment() {
         super.onDestroy()
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index 401303438..a27f4ddb0 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -4,22 +4,21 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".Subscriptions">
+
     <ProgressBar
         android:id="@+id/sub_progress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
         android:layout_centerHorizontal="true"
-        android:visibility="gone"
-        />
+        android:layout_centerVertical="true"
+        android:visibility="gone" />
 
     <RelativeLayout
         android:id="@+id/loginOrRegister"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_centerVertical="true"
         android:layout_centerHorizontal="true"
-        >
+        android:layout_centerVertical="true">
 
         <ImageView
             android:id="@+id/boogh"
@@ -40,36 +39,46 @@
             android:textSize="20sp"
             android:textStyle="bold" />
     </RelativeLayout>
-    <ScrollView
-        android:id="@+id/scrollview_sub"
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/sub_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <LinearLayout
+
+        <ScrollView
+            android:id="@+id/scrollview_sub"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-            <RelativeLayout
+            android:layout_height="match_parent">
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:descendantFocusability="blocksDescendants">
+                android:orientation="vertical">
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/sub_channels"
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:nestedScrollingEnabled="false" />
-            </RelativeLayout>
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:descendantFocusability="blocksDescendants">
+                    android:descendantFocusability="blocksDescendants">
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/sub_feed"
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/sub_channels"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:nestedScrollingEnabled="false" />
+                </RelativeLayout>
+
+                <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:nestedScrollingEnabled="false" />
-            </RelativeLayout>
-        </LinearLayout>
-    </ScrollView>
-</RelativeLayout>
\ No newline at end of file
+                    android:layout_height="wrap_content"
+                    android:descendantFocusability="blocksDescendants">
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/sub_feed"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:nestedScrollingEnabled="false" />
+                </RelativeLayout>
+            </LinearLayout>
+        </ScrollView>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+</RelativeLayout>