From 2afef8b2f9b4f2acb34b6b2c4739fee6f01e11a8 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@thelen.space>
Date: Thu, 25 Jun 2020 14:46:31 +0200
Subject: [PATCH] add pull to refresh to item list

---
 Habitica/res/layout/fragment_items.xml        | 26 ++++++++++++-------
 .../inventory/items/ItemRecyclerFragment.kt   | 13 +++++++++-
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Habitica/res/layout/fragment_items.xml b/Habitica/res/layout/fragment_items.xml
index 1a694a4ea..b34771600 100644
--- a/Habitica/res/layout/fragment_items.xml
+++ b/Habitica/res/layout/fragment_items.xml
@@ -1,9 +1,9 @@
 <?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:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
     <TextView
         android:layout_width="match_parent"
@@ -12,14 +12,22 @@
         android:id="@+id/titleTextView"
         android:background="?colorPrimary"
         android:textColor="@android:color/white" />
-    <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-        android:id="@+id/recyclerView"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/refreshLayout"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:scrollbarSize="3dp"
-        android:scrollbarThumbVertical="@color/scrollbarThumb"
-        android:scrollbars="vertical" />
+        android:layout_height="match_parent"
+        android:background="@color/gray_700"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+            <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:scrollbarSize="3dp"
+                android:scrollbarThumbVertical="@color/scrollbarThumb"
+                android:scrollbars="vertical" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
 
     <TextView
         android:layout_width="match_parent"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
index 50ed093fd..8e5a66086 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.view.Window
 import android.widget.Button
 import android.widget.TextView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
@@ -27,12 +28,13 @@ import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar.Companion.showSna
 import io.reactivex.functions.Consumer
 import javax.inject.Inject
 
-class ItemRecyclerFragment : BaseFragment() {
+class ItemRecyclerFragment : BaseFragment(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     lateinit var inventoryRepository: InventoryRepository
     @Inject
     lateinit var userRepository: UserRepository
+    val refreshLayout: SwipeRefreshLayout? by bindView(R.id.refreshLayout)
     val recyclerView: RecyclerViewEmptySupport? by bindView(R.id.recyclerView)
     val emptyView: View? by bindView(R.id.emptyView)
     private val emptyTextView: TextView? by bindView(R.id.empty_text_view)
@@ -70,6 +72,7 @@ class ItemRecyclerFragment : BaseFragment() {
         resetViews()
 
         recyclerView?.setEmptyView(emptyView)
+        refreshLayout?.setOnRefreshListener(this)
         emptyTextView?.text = getString(R.string.empty_items, itemTypeText)
 
         val context = activity
@@ -191,6 +194,14 @@ class ItemRecyclerFragment : BaseFragment() {
         outState.putString(ITEM_TYPE_KEY, this.itemType)
     }
 
+    override fun onRefresh() {
+        refreshLayout?.isRefreshing = true
+        compositeSubscription.add(userRepository.retrieveUser(true, true)
+                .doOnTerminate {
+                    refreshLayout?.isRefreshing = false
+                }.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
+    }
+
     private fun hatchPet(potion: HatchingPotion, egg: Egg) {
         dismiss()
         (activity as? MainActivity)?.hatchPet(potion, egg)