From 658ee56f25aa1684da9be5ec03f4bbce75222337 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 6 Jul 2021 14:43:12 +0200
Subject: [PATCH] Improve all kind of list handling. Fixes #1578

---
 Habitica/build.gradle                         |   2 +-
 .../baseline_error_outline_black_36dp.png     | Bin 0 -> 746 bytes
 .../baseline_error_outline_black_36dp.png     | Bin 0 -> 499 bytes
 .../baseline_error_outline_black_36dp.png     | Bin 0 -> 954 bytes
 .../baseline_error_outline_black_36dp.png     | Bin 0 -> 1790 bytes
 .../baseline_error_outline_black_36dp.png     | Bin 0 -> 2631 bytes
 Habitica/res/layout/empty_item.xml            |  43 +++++
 Habitica/res/layout/failed_item.xml           |  25 +++
 .../res/layout/fragment_challengeslist.xml    |  55 ------
 Habitica/res/layout/fragment_items.xml        |  19 ---
 Habitica/res/layout/fragment_recyclerview.xml |  27 +--
 .../layout/fragment_recyclerview_stable.xml   |  23 ---
 .../layout/fragment_refresh_recyclerview.xml  |  37 -----
 Habitica/res/layout/loading_item.xml          |  11 ++
 Habitica/res/values/strings.xml               |   4 +
 .../RealmInventoryLocalRepository.kt          |   1 +
 .../adapter/inventory/ShopRecyclerAdapter.kt  |  18 +-
 .../inventory/StableRecyclerAdapter.kt        |   1 +
 .../tasks/RewardsRecyclerViewAdapter.kt       |   3 +
 .../equipment/EquipmentDetailFragment.kt      |  13 ++
 .../inventory/items/ItemDialogFragment.kt     |  12 +-
 .../inventory/items/ItemRecyclerFragment.kt   |  44 ++---
 .../fragments/inventory/shops/ShopFragment.kt |  24 ++-
 .../stable/StableRecyclerFragment.kt          |   5 +-
 .../challenges/ChallengeListFragment.kt       |  11 +-
 .../tasks/TaskRecyclerViewFragment.kt         |  61 ++++---
 .../ui/helpers/RecyclerViewEmptySupport.kt    | 156 ++++++++++++++++--
 .../ui/views/dialogs/HabiticaAlertDialog.kt   |   9 +-
 28 files changed, 359 insertions(+), 245 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/baseline_error_outline_black_36dp.png
 create mode 100644 Habitica/res/drawable-mdpi/baseline_error_outline_black_36dp.png
 create mode 100644 Habitica/res/drawable-xhdpi/baseline_error_outline_black_36dp.png
 create mode 100644 Habitica/res/drawable-xxhdpi/baseline_error_outline_black_36dp.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/baseline_error_outline_black_36dp.png
 create mode 100644 Habitica/res/layout/empty_item.xml
 create mode 100644 Habitica/res/layout/failed_item.xml
 delete mode 100644 Habitica/res/layout/fragment_challengeslist.xml
 delete mode 100644 Habitica/res/layout/fragment_recyclerview_stable.xml
 create mode 100644 Habitica/res/layout/loading_item.xml

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 8ddd9ea96..c17635d69 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -146,7 +146,7 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2991
+        versionCode 2994
         versionName "3.3"
     }
 
diff --git a/Habitica/res/drawable-hdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-hdpi/baseline_error_outline_black_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec4860d026be38f31181fb3ea2a482f16834ed85
GIT binary patch
literal 746
zcmV<G0u}v<P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00089Nkl<ZcwX(A
zyNVS-5QhIiGX+6?0}+h81!C5MCW5y}48%1N12H!;Q(r@K5qt$BHSv;q0Wn=O4OG<n
zIL^}3H8RsZecavVeDK54TU}j!X1b=jXQUM?R%};xn~s~Vm~NWx{?!fBWz#X!t_|xg
z4#7S!y)^wY{T|Uz({s~3(_w8fcABo6-pU7_t5>G0rXAX3E}1^c2RK*nOy{);>^D7?
z52&`DnD**FankfzK8RTBriWVGqQP`Pi$sC=n>PN34Yq0jSf5NMv}DeizR3^X>9OgQ
z^418p^r3I+uhUo4*{(xvnA8vXLD4fUuH;<sfv?m*`mQBRjsb_R6cfE2+0_D{Lq8%{
zuG($6Ps3~Ki|I^cR~vjYMmjEQu1Z1~%6<%ZC^lLWj4?DhvgIr;$~)y2IUO5~ut$q5
z7>l;4FxJp*c_B8+fr{dTyu;iz736);mIGs^KHe)Y`);r%?~II<OOW?NTP{P{@><Vg
zB5%}pLQz|i(t~_JwB^FsX<_}kXEA}J^1<)`Eg{JJqOF9Xhxn16#RzOYQU_EAB?Nh2
zw3R>%sjvGzixFO^-<f)@XrZd^#E2oSEs1p!6sl|h<IazI7I_5Kn-~yF?2A|@?Zny6
zr-88fD<#PLqpcKTN&OM?D4bEG9Ybu8Nzn5B5%Vaw<U1bhS>zGq{n1tmv84Wpd6YZy
z9XW9-CCK}utrTKO{Sosh%}%V@Td{WXm|NYa1o`+TC6C(azBa|_zV-vUHpCLgHu(V!
zHA||R%qpp%W)WO-jm<8Co87iRlN(J~lMkqgqk(1*bD+uNw~i(cOrhB$ZfNqQL`Rda
zkvf>%(3R`N19aQH`0L<T9a?j-sOPrTtJ;nxU#`bA_c=sNlOM38H1)~Rzu+{fnUBO)
ctXR?K59kMu-=^ouIRF3v07*qoM6N<$g1=^JyZ`_I

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-mdpi/baseline_error_outline_black_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8994911faab3507fb4979f10a5676608060607d2
GIT binary patch
literal 499
zcmV<P0Sx|$P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0005HNkl<ZcwX(8
zK`sSB5QYm27TiLdf@HR0hZ}GOVrL;1VkMkGES<o+hOi<eSh7cbW-8OuPtWUak96XF
z$)9vyS5;Scb@$9XkqQ5RY1NAAST#`Hs@_zus+;DwBh|8Ms`2?1=2UyC7u83ko>V)k
zSs62%s(Tq8FjjY}br}Pc=TL?RAh|Qunrcxs--tH9(dSR#U3DNoC?m;SNH^%CYD+ca
z*oD9bTYTIY=aQL}zcQCnuR<#L;OoX>rIOf?dWkK-iPS5W3%<l~%NM<;I8AQ-nO$Ep
zm1@5c?GVIpSBj0!SR>h$*6BgD(Cr?AM9iLcAH*W2*>ffI!YrPpb=dB9e@jY2Kuoje
zp6XluuN&BmDO=2GN==BE?v~(255nWX3{Snj5UB|PvCW4ugAAlKT=n`w<RnCF^SSc+
zI$TR@xa9SP$VrIU=EImlcw(F3sMBTSBt&fUVay=KC6rULO6o)q?HHm<HjvgZc2nmN
zy{U7KeGbvbKIdYrB&}pg7h`dc4k+s33dOyCKv6GfMp3V@z^saT$p@11R|>Jm{`@n@
prI-&zm!dwUT_|G_e>O}gf=~SVAB2U+kQ4v_002ovPDHLkV1jk2=;Z(a

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-xhdpi/baseline_error_outline_black_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..356880514a609db407c37d792989adeb8cacbcde
GIT binary patch
literal 954
zcmV;r14aCaP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000AlNkl<ZcwX(C
zJBt)S5XVae#b+WuV?ThAk+>*6Qw9ANDh8q-!Bhi{^h8l3!AGX(si+8ovC&4NatCVW
z1JwH8Zr?UlJ3Bo))xCR1{on`3T~Ad_-)&EK&&&}yj^j9vlg@hf2z!CO$-ZN|>}U30
z-%tJTy=AYn=h=hoT3V)TXV0;(*k3g0h^GEzXW7&27Fq`EXCJeFNS|z5f3pwRy|e^5
zz`iDZQn{RE_t6qyCwq_d36$~{yN#xlQ|u4YMVIy)dz_|-HSAT=g^uzodzU@K9%FY=
zZy*ogYkUtsLmRZkF*435FSDy@!faxnlP+$U^XwIN&%%-8fnyN^v1I&VK4mv79615-
zS^q$~C@JPNXW4bV!%RRd#6)bFPx_uFFeSiWPF?5VGJJ`86T@5}HgX`B%r84>WB-`!
zV9a?&x`^11?Cx+t0gwwhWgW3ksL+^HHz41qg1@Z@<V0>+Pb|i-tehmBH1-<1YO!^B
zkQ+6~x?)c(wl-!5`<-;cxO1k3QJsW&Qaq(F;|}R$LHud295kIcsAbg0?e?Il4On!_
zBtZ<0ZO0rLGuQ^yR5ft_WjlkW?ZGyMOagIvwYXZzxWTrdwyG(>%cxx|I;4XKF$b|g
z#tmA48fDy|$qv9H(t#mnu~w5n89QhJYOI=ZKaARq1(p+4n_ZadTOngxb`U_VGB(7y
zZH?MBrYbNNi<WCE8Q;2tP;1o!7rO;x^MZ6hXgwp9@vS=upk^5#;vB~Uy<WA!-e${U
z7&3m24noZ`KEyeW^=UXvIvD)Iu87)MAamsCAk>W7We#{KYM0DK(t#j$_pFgQa&!<t
z?J@_%J-WuskPZY}4Qdt09Jx9OwaXmvM%*ZsH>3l>qj4i6WR9RUs9olOIM>E>Ne6=1
zOt(hn2wH>MWe(Vl8>KQwIuP6(H!?!z2wH>MWe$jQZ4B;%%Rn&4wx!IGtAkLx%mHz(
zjqwhu!9QX(bV&z-K1lZ|d6_ST>1BR~bRd{xqF4&kiDJp6Mk!2}8YLI2B`{yCmfY?r
zf%$d^D79f$0`m<s;9IUW_@;dVe%q&p4(Y%_zj4^dZ#~!G4=*I(kH6I54^SoGkKiTX
z4{_Guj{zs(50WR~uOcMiFS8`zuR|r`FVrRAuVg0TFZCwkuZ1UqLD&DWKqCIHDICXf
c9H$8X0kxuok<0~LTmS$707*qoM6N<$g5#;TkpKVy

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-xxhdpi/baseline_error_outline_black_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a65cafc82143840857a709e9b9650c03052896b4
GIT binary patch
literal 1790
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
PuL01`o=!EFvFZN+buw~!

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-xxxhdpi/baseline_error_outline_black_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a0d146a4e4e89e22c8dee48cf167b417238e7ec
GIT binary patch
literal 2631
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
RJT{1IrbckXitBE%{{SU2D>488

literal 0
HcmV?d00001

diff --git a/Habitica/res/layout/empty_item.xml b/Habitica/res/layout/empty_item.xml
new file mode 100644
index 000000000..313983fb2
--- /dev/null
+++ b/Habitica/res/layout/empty_item.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/emptyView"
+    style="@style/EmptyView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/empty_icon_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp" />
+
+    <TextView
+        android:id="@+id/emptyViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="6dp"
+        android:gravity="center"
+        android:textColor="@color/text_ternary"
+        android:textSize="@dimen/card_medium_text"
+        tools:text="No Items" />
+
+    <TextView
+        android:id="@+id/emptyViewDescription"
+        style="@style/Body2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textColor="@color/text_ternary"
+        tools:text="No Items" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/HabiticaButton.Primary"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_marginTop="@dimen/spacing_large"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/failed_item.xml b/Habitica/res/layout/failed_item.xml
new file mode 100644
index 000000000..9944a2a90
--- /dev/null
+++ b/Habitica/res/layout/failed_item.xml
@@ -0,0 +1,25 @@
+<?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="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+    <androidx.constraintlayout.utils.widget.ImageFilterView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/baseline_error_outline_black_36dp"
+        android:tint="@color/text_quad"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/failed"
+        style="@style/Headline"
+        android:textColor="@color/text_primary"/>
+    <Button
+        android:id="@+id/refresh_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/HabiticaButton.Primary"
+        android:text="@string/retry"
+        android:layout_marginTop="@dimen/spacing_large" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_challengeslist.xml b/Habitica/res/layout/fragment_challengeslist.xml
deleted file mode 100644
index 4f0cc63cb..000000000
--- a/Habitica/res/layout/fragment_challengeslist.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/refreshLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    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:divider="@null"
-            android:scrollbars="vertical"
-            />
-        <LinearLayout
-            android:id="@+id/emptyView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="48dp"
-            android:layout_marginEnd="48dp"
-            android:layout_marginTop="32dp"
-            android:orientation="vertical">
-
-            <TextView
-                style="@style/Headline"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:maxLines="2"
-                android:text="@string/not_part_of_a_challenge"
-                android:textAlignment="center"
-                android:textColor="#8a000000" />
-
-            <TextView
-                style="@style/Body2"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="22dp"
-                android:gravity="center"
-                android:text="@string/join_a_challenge"
-                android:textAlignment="center"
-                android:textColor="#66000000" />
-
-            <TextView
-                style="@style/Body2"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="22dp"
-                android:gravity="center"
-                android:text="@string/check_the_public_challenge_tab"
-                android:textAlignment="center"
-                android:textColor="#66000000" />
-
-        </LinearLayout>
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/Habitica/res/layout/fragment_items.xml b/Habitica/res/layout/fragment_items.xml
index 34a0fe2e9..6bdd962ee 100644
--- a/Habitica/res/layout/fragment_items.xml
+++ b/Habitica/res/layout/fragment_items.xml
@@ -41,23 +41,4 @@
         android:text="@string/open_market"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"/>
-
-    <LinearLayout
-        android:id="@+id/emptyView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/empty_text_view"
-            style="@style/EmptyView"
-            android:gravity="center" />
-        <Button
-            android:id="@+id/openEmptyMarketButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/open_market"/>
-    </LinearLayout>
 </LinearLayout>
diff --git a/Habitica/res/layout/fragment_recyclerview.xml b/Habitica/res/layout/fragment_recyclerview.xml
index c46cfa83b..4ebfab202 100644
--- a/Habitica/res/layout/fragment_recyclerview.xml
+++ b/Habitica/res/layout/fragment_recyclerview.xml
@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recyclerView"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbarSize="3dp"
-        android:scrollbarThumbVertical="@color/scrollbarThumb"
-        android:scrollbars="vertical"
-        android:clipToPadding="false"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/emptyView"
-        style="@style/EmptyView"
-        android:visibility="gone"/>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+    android:layout_height="match_parent"
+    android:scrollbarSize="3dp"
+    android:scrollbarThumbVertical="@color/scrollbarThumb"
+    android:scrollbars="vertical"
+    android:clipToPadding="false"/>
diff --git a/Habitica/res/layout/fragment_recyclerview_stable.xml b/Habitica/res/layout/fragment_recyclerview_stable.xml
deleted file mode 100644
index c46cfa83b..000000000
--- a/Habitica/res/layout/fragment_recyclerview_stable.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbarSize="3dp"
-        android:scrollbarThumbVertical="@color/scrollbarThumb"
-        android:scrollbars="vertical"
-        android:clipToPadding="false"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/emptyView"
-        style="@style/EmptyView"
-        android:visibility="gone"/>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml
index 4e9ddf75e..b97735dc9 100644
--- a/Habitica/res/layout/fragment_refresh_recyclerview.xml
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
@@ -19,40 +18,4 @@
             android:scrollbarThumbVertical="@color/scrollbarThumb"
             android:scrollbars="vertical" />
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <LinearLayout
-        android:id="@+id/emptyView"
-        style="@style/EmptyView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="60dp"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <ImageView
-            android:id="@+id/empty_icon_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp" />
-
-        <TextView
-            android:id="@+id/emptyViewTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="6dp"
-            android:gravity="center"
-            android:textColor="@color/text_ternary"
-            android:textSize="@dimen/card_medium_text"
-            tools:text="No Items" />
-
-        <TextView
-            android:id="@+id/emptyViewDescription"
-            style="@style/Body2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textColor="@color/text_ternary"
-            tools:text="No Items" />
-    </LinearLayout>
 </LinearLayout>
diff --git a/Habitica/res/layout/loading_item.xml b/Habitica/res/layout/loading_item.xml
new file mode 100644
index 000000000..87140c59c
--- /dev/null
+++ b/Habitica/res/layout/loading_item.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+<ProgressBar
+    android:id="@+id/loading_indicator"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+     />
+</FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index fed84e82a..b02d6c5db 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1166,6 +1166,10 @@
     <string name="locked_equipment_shop_dialog">You must purchase the previous items in this sequence to unlock</string>
     <string name="caused_damage">You caused damage to the boss</string>
     <string name="avatar_style">Style</string>
+    <string name="failed">Failed to load</string>
     <string name="daily_item_checkbox">Daily Checkbox</string>
+    <string name="retry">Retry</string>
+    <string name="empty_title">Nothing here yet</string>
+    <string name="empty_equipment_description">You don\'t have any equipment of this type yet. You can purchase equipment from the market using the gold you earned.</string>
     <string name="todo_item_checkbox">Todo Checkbox</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index cb366c2bb..8123bd95e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
@@ -87,6 +87,7 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
                 "hatchingPotions" -> it.items?.hatchingPotions
                 "food" -> it.items?.food
                 "quests" -> it.items?.quests
+                "special" -> it.items?.special?.ownedItems
                 else -> emptyList()
             } ?: emptyList()
             if (includeZero) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
index e6d45237a..531671e3c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
@@ -30,13 +30,17 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<an
     var shopSpriteSuffix: String = ""
     set(value) {
         field = value
-        notifyItemChanged(0)
+        if (items.size > 0) {
+            notifyItemChanged(0)
+        }
     }
     var context: Context? = null
     var user: User? = null
     set(value) {
         field = value
-        this.notifyDataSetChanged()
+        if (items.size > 0) {
+            this.notifyDataSetChanged()
+        }
     }
     private var pinnedItemKeys: List<String> = ArrayList()
 
@@ -49,7 +53,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<an
     internal var selectedGearCategory: String = ""
     set(value) {
         field = value
-        if (field != "") {
+        if (field != "" && items.size > 0) {
             notifyDataSetChanged()
         }
     }
@@ -200,12 +204,16 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<an
 
     fun setOwnedItems(ownedItems: Map<String, OwnedItem>) {
         this.ownedItems = ownedItems
-        this.notifyDataSetChanged()
+        if (items.size > 0) {
+            this.notifyDataSetChanged()
+        }
     }
 
     fun setPinnedItemKeys(pinnedItemKeys: List<String>) {
         this.pinnedItemKeys = pinnedItemKeys
-        this.notifyDataSetChanged()
+        if (items.size > 0) {
+            this.notifyDataSetChanged()
+        }
     }
 
     internal class ShopHeaderViewHolder(parent: ViewGroup) : androidx.recyclerview.widget.RecyclerView.ViewHolder(parent.inflate(R.layout.shop_header)) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
index 1ba31a2c3..6148c7e26 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
@@ -135,6 +135,7 @@ class StableRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     }
 
     override fun getItemViewType(position: Int): Int {
+        if (itemList.size <= position) { return 0 }
         val item = itemList[position]
         return if (item == "header") {
             0
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
index 7b350c6b9..b9b8cf26b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.kt
@@ -21,6 +21,9 @@ import io.reactivex.rxjava3.subjects.PublishSubject
 class RewardsRecyclerViewAdapter(private var customRewards: List<Task>?, private val layoutResource: Int) : BaseRecyclerViewAdapter<Task, RecyclerView.ViewHolder>(), TaskRecyclerViewAdapter {
     var user: User? = null
     set(value) {
+        if (field?.versionNumber == value?.versionNumber) {
+            return
+        }
         field = value
         notifyDataSetChanged()
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
index 141d147e4..6a018e1b5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
@@ -7,12 +7,15 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 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
 import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
+import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import javax.inject.Inject
 
@@ -29,6 +32,7 @@ class EquipmentDetailFragment : BaseMainFragment<FragmentRefreshRecyclerviewBind
     }
 
     var type: String? = null
+    var typeText: String? = null
     var equippedGear: String? = null
     var isCostume: Boolean? = null
 
@@ -52,6 +56,15 @@ class EquipmentDetailFragment : BaseMainFragment<FragmentRefreshRecyclerviewBind
             equippedGear = args.equippedGear
         }
         binding?.refreshLayout?.setOnRefreshListener(this)
+        binding?.recyclerView?.onRefresh = { onRefresh() }
+        binding?.recyclerView?.emptyItem = EmptyItem(
+            getString(R.string.empty_title),
+            getString(R.string.empty_equipment_description),
+            null,
+            getString(R.string.open_market)
+        ) {
+            MainNavigationController.navigate(R.id.marketFragment)
+        }
 
         this.adapter.equippedGear = this.equippedGear
         this.adapter.isCostume = this.isCostume
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
index 11906f31b..b69d9cb67 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
@@ -22,7 +22,7 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseDialogFragment
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.helpers.loadImage
 import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
@@ -78,9 +78,13 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsBinding>(), SwipeRefr
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding?.recyclerView?.setEmptyView(binding?.emptyView)
         binding?.refreshLayout?.setOnRefreshListener(this)
-        binding?.emptyTextView?.text = getString(R.string.empty_items, itemTypeText)
+        binding?.recyclerView?.emptyItem = EmptyItem(
+            getString(R.string.empty_items, itemTypeText),
+            getString(R.string.open_market)
+        ) {
+            openMarket()
+        }
 
         val context = activity
 
@@ -176,7 +180,7 @@ class ItemDialogFragment : BaseDialogFragment<FragmentItemsBinding>(), SwipeRefr
             openMarket()
         }
 
-        binding?.openEmptyMarketButton?.setOnClickListener { openMarket() }
+        //binding?.openEmptyMarketButton?.setOnClickListener { openMarket() }
 
         this.loadItems()
     }
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 5850746b6..6cf61ecb9 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
@@ -1,11 +1,9 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.items
 
-import android.graphics.drawable.BitmapDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.Window
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -23,10 +21,9 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.activities.MainActivity
 import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.helpers.loadImage
-import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import com.habitrpg.android.habitica.ui.views.dialogs.OpenedMysteryitemDialog
 import javax.inject.Inject
 
@@ -62,9 +59,15 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding?.recyclerView?.setEmptyView(binding?.emptyView)
         binding?.refreshLayout?.setOnRefreshListener(this)
-        binding?.emptyTextView?.text = getString(R.string.empty_items, itemTypeText)
+        binding?.recyclerView?.emptyItem = EmptyItem(
+            getString(R.string.empty_items, itemTypeText ?: itemType),
+            null,
+            null,
+            getString(R.string.open_market)
+        ) {
+            openMarket()
+        }
 
         val context = activity
 
@@ -129,8 +132,6 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
             openMarket()
         }
 
-        binding?.openEmptyMarketButton?.setOnClickListener { openMarket() }
-
         this.loadItems()
     }
 
@@ -176,20 +177,21 @@ class ItemRecyclerFragment : BaseFragment<FragmentItemsBinding>(), SwipeRefreshL
         }
         itemType?.let { type ->
             compositeSubscription.add(inventoryRepository.getOwnedItems(type)
-                    .doOnNext { items ->
-                        adapter?.data = items
+                .map { it.distinctBy { it.key } }
+                .doOnNext { items ->
+                    adapter?.data = items
+                }
+                .map { items -> items.mapNotNull { it.key } }
+                .flatMap { inventoryRepository.getItems(itemClass, it.toTypedArray()) }
+                .map {
+                    val itemMap = mutableMapOf<String, Item>()
+                    for (item in it) {
+                        itemMap[item.key] = item
                     }
-                    .map { items -> items.mapNotNull { it.key } }
-                    .flatMap { inventoryRepository.getItems(itemClass, it.toTypedArray()) }
-                    .map {
-                        val itemMap = mutableMapOf<String, Item>()
-                        for (item in it) {
-                            itemMap[item.key] = item
-                        }
-                        itemMap
-                    }
-                    .subscribe({ items ->
-                    adapter?.items = items
+                    itemMap
+                }
+                .subscribe({ items ->
+                adapter?.items = items
             }, RxErrorHandler.handleEmptyError()))
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
index e4fbd27d9..2f6e00f91 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopFragment.kt
@@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.InventoryRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.databinding.FragmentRecyclerviewBinding
+import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.events.GearPurchasedEvent
 import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
@@ -22,12 +23,13 @@ import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.adapter.inventory.ShopRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.RecyclerViewState
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.views.CurrencyViews
 import org.greenrobot.eventbus.Subscribe
 import javax.inject.Inject
 
-open class ShopFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
+open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>() {
 
     internal val currencyView: CurrencyViews by lazy {
         val view = CurrencyViews(context)
@@ -48,10 +50,10 @@ open class ShopFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
 
     private var gearCategories: MutableList<ShopCategory>? = null
 
-    override var binding: FragmentRecyclerviewBinding? = null
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRecyclerviewBinding {
-        return FragmentRecyclerviewBinding.inflate(inflater, container, false)
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -70,7 +72,12 @@ open class ShopFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
         super.onViewCreated(view, savedInstanceState)
         toolbarAccessoryContainer?.addView(currencyView)
         binding?.recyclerView?.setBackgroundResource(R.color.content_background)
-
+        binding?.recyclerView?.onRefresh = {
+            loadShopInventory()
+        }
+        binding?.refreshLayout?.setOnRefreshListener {
+            loadShopInventory()
+        }
         adapter = binding?.recyclerView?.adapter as? ShopRecyclerAdapter
         if (adapter == null) {
             adapter = ShopRecyclerAdapter()
@@ -178,7 +185,12 @@ open class ShopFragment : BaseMainFragment<FragmentRecyclerviewBinding>() {
                 .subscribe({
                     this.shop = it
                     this.adapter?.setShop(it)
-                }, RxErrorHandler.handleEmptyError()))
+                }, {
+                    binding?.recyclerView?.state = RecyclerViewState.FAILED
+                    RxErrorHandler.reportError(it)
+                }, {
+                    binding?.refreshLayout?.isRefreshing = false
+                }))
 
         compositeSubscription.add(this.inventoryRepository.getOwnedItems()
                 .subscribe({ adapter?.setOwnedItems(it) }, RxErrorHandler.handleEmptyError()))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
index e6e9ddfc4..2cece79fa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
@@ -20,6 +20,7 @@ import com.habitrpg.android.habitica.models.inventory.StableSection
 import com.habitrpg.android.habitica.models.user.*
 import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import io.reactivex.rxjava3.core.Flowable
@@ -70,8 +71,8 @@ class StableRecyclerFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding?.recyclerView?.setEmptyView(binding?.emptyView)
-        binding?.emptyViewTitle?.text = getString(R.string.empty_items, itemTypeText)
+        binding?.recyclerView?.emptyItem = EmptyItem(
+            getString(R.string.empty_items, itemTypeText))
         binding?.refreshLayout?.setOnRefreshListener(this)
 
         layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 2)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index ae8ea3a96..f4521f6bb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.SocialRepository
 import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.databinding.FragmentChallengeslistBinding
+import com.habitrpg.android.habitica.databinding.FragmentRefreshRecyclerviewBinding
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Challenge
@@ -26,7 +26,7 @@ import javax.inject.Inject
 import javax.inject.Named
 
 
-class ChallengeListFragment : BaseFragment<FragmentChallengeslistBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+class ChallengeListFragment : BaseFragment<FragmentRefreshRecyclerviewBinding>(), androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     lateinit var challengeRepository: ChallengeRepository
@@ -37,10 +37,10 @@ class ChallengeListFragment : BaseFragment<FragmentChallengeslistBinding>(), and
     @field:[Inject Named(AppModule.NAMED_USER_ID)]
     lateinit var userId: String
 
-    override var binding: FragmentChallengeslistBinding? = null
+    override var binding: FragmentRefreshRecyclerviewBinding? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentChallengeslistBinding {
-        return FragmentChallengeslistBinding.inflate(inflater, container, false)
+    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRefreshRecyclerviewBinding {
+        return FragmentRefreshRecyclerviewBinding.inflate(inflater, container, false)
     }
 
     private var challengeAdapter: ChallengesListViewAdapter? = null
@@ -84,7 +84,6 @@ class ChallengeListFragment : BaseFragment<FragmentChallengeslistBinding>(), and
             filterGroups?.addAll(it.second)
         }, RxErrorHandler.handleEmptyError()))
 
-        binding?.recyclerView?.setEmptyView(binding?.emptyView)
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
         challengeAdapter?.updateUnfilteredData(challenges)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
index ad046884e..f8d087c9f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
@@ -29,6 +29,7 @@ import com.habitrpg.android.habitica.ui.activities.TaskFormActivity
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.adapter.tasks.*
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment
+import com.habitrpg.android.habitica.ui.helpers.EmptyItem
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
@@ -288,51 +289,61 @@ open class TaskRecyclerViewFragment : BaseFragment<FragmentRefreshRecyclerviewBi
     }
 
     private fun setEmptyLabels() {
-        binding?.recyclerView?.setEmptyView(binding?.emptyView)
-        context?.let { binding?.emptyIconView?.setColorFilter(ContextCompat.getColor(it, R.color.text_dimmed), android.graphics.PorterDuff.Mode.MULTIPLY) }
-        if (taskFilterHelper.howMany(taskType) > 0) {
+        binding?.recyclerView?.emptyItem = if (taskFilterHelper.howMany(taskType) > 0) {
             when (this.taskType) {
                 Task.TYPE_HABIT -> {
-                    binding?.emptyIconView?.setImageResource(R.drawable.icon_habits)
-                    binding?.emptyViewTitle?.setText(R.string.empty_title_habits_filtered)
-                    binding?.emptyViewDescription?.setText(R.string.empty_description_habits_filtered)
+                    EmptyItem(
+                        getString(R.string.empty_title_habits_filtered),
+                        getString(R.string.empty_description_habits_filtered),
+                        R.drawable.icon_habits)
                 }
                 Task.TYPE_DAILY -> {
-                    binding?.emptyIconView?.setImageResource(R.drawable.icon_dailies)
-                    binding?.emptyViewTitle?.setText(R.string.empty_title_dailies_filtered)
-                    binding?.emptyViewDescription?.setText(R.string.empty_description_dailies_filtered)
+                    EmptyItem(
+                        getString(R.string.empty_title_dailies_filtered),
+                        getString(R.string.empty_description_dailies_filtered),
+                        R.drawable.icon_dailies)
                 }
                 Task.TYPE_TODO -> {
-                    binding?.emptyIconView?.setImageResource(R.drawable.icon_todos)
-                    binding?.emptyViewTitle?.setText(R.string.empty_title_todos_filtered)
-                    binding?.emptyViewDescription?.setText(R.string.empty_description_todos_filtered)
+                    EmptyItem(
+                        getString(R.string.empty_title_todos_filtered),
+                        getString(R.string.empty_description_todos_filtered),
+                        R.drawable.icon_todos)
                 }
                 Task.TYPE_REWARD -> {
-                    binding?.emptyIconView?.setImageResource(R.drawable.icon_rewards)
-                    binding?.emptyViewTitle?.setText(R.string.empty_title_rewards)
+                    EmptyItem(
+                        getString(R.string.empty_title_rewards_filtered),
+                        null,
+                        R.drawable.icon_rewards)
                 }
+                else -> EmptyItem("")
             }
         } else {
             when (this.taskType) {
                 Task.TYPE_HABIT -> {
-                    binding?.emptyIconView?.setImageResource(R.drawable.icon_habits)
-                    binding?.emptyViewTitle?.setText(R.string.empty_title_habits)
-                    binding?.emptyViewDescription?.setText(R.string.empty_description_habits)
+                    EmptyItem(
+                        getString(R.string.empty_title_habits),
+                        getString(R.string.empty_description_habits),
+                        R.drawable.icon_habits)
                 }
                 Task.TYPE_DAILY -> {
-                    binding?.emptyIconView?.setImageResource(R.drawable.icon_dailies)
-                    binding?.emptyViewTitle?.setText(R.string.empty_title_dailies)
-                    binding?.emptyViewDescription?.setText(R.string.empty_description_dailies)
+                    EmptyItem(
+                        getString(R.string.empty_title_dailies),
+                        getString(R.string.empty_description_dailies),
+                        R.drawable.icon_dailies)
                 }
                 Task.TYPE_TODO -> {
-                    binding?.emptyIconView?.setImageResource(R.drawable.icon_todos)
-                    binding?.emptyViewTitle?.setText(R.string.empty_title_todos)
-                    binding?.emptyViewDescription?.setText(R.string.empty_description_todos)
+                    EmptyItem(
+                        getString(R.string.empty_title_todos),
+                        getString(R.string.empty_description_todos),
+                        R.drawable.icon_todos)
                 }
                 Task.TYPE_REWARD -> {
-                    binding?.emptyIconView?.setImageResource(R.drawable.icon_rewards)
-                    binding?.emptyViewTitle?.setText(R.string.empty_title_rewards)
+                    EmptyItem(
+                        getString(R.string.empty_title_rewards),
+                        null,
+                        R.drawable.icon_rewards)
                 }
+                else -> EmptyItem("")
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt
index b771fa8e5..7a38fa3dc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.kt
@@ -3,22 +3,108 @@ package com.habitrpg.android.habitica.ui.helpers
 import android.content.Context
 import android.util.AttributeSet
 import android.view.View
+import android.view.ViewGroup
+import android.view.animation.AlphaAnimation
+import android.widget.ProgressBar
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.EmptyItemBinding
+import com.habitrpg.android.habitica.databinding.FailedItemBinding
+import com.habitrpg.android.habitica.extensions.inflate
+
+data class EmptyItem(
+    var title: String,
+    var text: String? = null,
+    var iconResource: Int? = null,
+    var buttonLabel: String? = null,
+    var onButtonTap: (() -> Unit)? = null
+)
+
+enum class RecyclerViewState {
+    LOADING,
+    EMPTY,
+    DISPLAYING_DATA,
+    FAILED
+}
 
-//http://stackoverflow.com/a/27801394/1315039
 class RecyclerViewEmptySupport : RecyclerView {
-    private var emptyView: View? = null
+    var onRefresh: (() -> Unit)? = null
+    var state: RecyclerViewState = RecyclerViewState.LOADING
+    set(value) {
+        field = value
+        when (field) {
+            RecyclerViewState.DISPLAYING_DATA -> updateAdapter(actualAdapter)
+            else -> {
+                updateAdapter(emptyAdapter)
+                emptyAdapter.notifyDataSetChanged()
+            }
+        }
+    }
+
+    private fun updateAdapter(newAdapter: Adapter<*>?) {
+        if (adapter != newAdapter) {
+            super.setAdapter(newAdapter)
+        }
+    }
+
+    var emptyItem: EmptyItem? = null
+    set(value) {
+        field = value
+        emptyAdapter.notifyDataSetChanged()
+    }
+
+    private var actualAdapter: Adapter<*>? = null
+    private val emptyAdapter: Adapter<ViewHolder> = object : Adapter<ViewHolder>() {
+        override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+            return when (viewType) {
+                0 -> {
+                    val view = parent.inflate(R.layout.loading_item)
+                    val animation1 = AlphaAnimation(0.0f, 1.0f)
+                    animation1.duration = 300
+                    animation1.startOffset = 500
+                    animation1.fillAfter = true
+                    view.findViewById<ProgressBar>(R.id.loading_indicator).startAnimation(animation1)
+                    object : ViewHolder(view) {}
+                }
+                1 -> FailedViewHolder(parent.inflate(R.layout.failed_item))
+                else -> EmptyViewHolder(parent.inflate(R.layout.empty_item))
+            }
+        }
+
+        override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+            if (holder is EmptyViewHolder) {
+                holder.bind(emptyItem)
+            } else if (holder is FailedViewHolder) {
+                holder.bind(onRefresh)
+            }
+            (holder as? EmptyViewHolder)?.bind(emptyItem)
+        }
+
+        override fun getItemCount(): Int {
+            return 1
+        }
+
+        override fun getItemViewType(position: Int): Int {
+            return when (state) {
+                RecyclerViewState.LOADING -> 0
+                RecyclerViewState.FAILED -> 1
+                else -> 2
+            }
+        }
+    }
+
     private val observer = object : RecyclerView.AdapterDataObserver() {
         override fun onChanged() {
-            checkIfEmpty()
+            updateState()
         }
 
         override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
-            checkIfEmpty()
+            updateState()
         }
 
         override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
-            checkIfEmpty()
+            updateState()
         }
     }
 
@@ -28,25 +114,59 @@ class RecyclerViewEmptySupport : RecyclerView {
 
     constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
 
-    internal fun checkIfEmpty() {
-        if (emptyView != null && adapter != null) {
-            val emptyViewVisible = adapter?.itemCount == 0
-            emptyView?.visibility = if (emptyViewVisible) View.VISIBLE else View.GONE
-            visibility = if (emptyViewVisible) View.GONE else View.VISIBLE
+    internal fun updateState(isInitial: Boolean = false) {
+        if (actualAdapter != null && !isInitial) {
+            val emptyViewVisible = actualAdapter?.itemCount == 0
+            if (emptyViewVisible) {
+                state = RecyclerViewState.EMPTY
+            } else {
+                state = RecyclerViewState.DISPLAYING_DATA
+            }
+        } else {
+            state = RecyclerViewState.LOADING
         }
     }
 
     override fun setAdapter(adapter: Adapter<*>?) {
-        val oldAdapter = getAdapter()
+        val oldAdapter = actualAdapter
         oldAdapter?.unregisterAdapterDataObserver(observer)
         super.setAdapter(adapter)
         adapter?.registerAdapterDataObserver(observer)
-
-        checkIfEmpty()
-    }
-
-    fun setEmptyView(emptyView: View?) {
-        this.emptyView = emptyView
-        checkIfEmpty()
+        actualAdapter = adapter
+        updateState(true)
+    }
+}
+
+class FailedViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    private val binding = FailedItemBinding.bind(itemView)
+
+    fun bind(onRefresh: (() -> Unit)?) {
+        if (onRefresh != null) {
+            binding.refreshButton.visibility = View.VISIBLE
+            binding.refreshButton.setOnClickListener { onRefresh() }
+        } else {
+            binding.refreshButton.visibility = View.GONE
+        }
+    }
+}
+
+class EmptyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    private val binding = EmptyItemBinding.bind(itemView)
+
+    fun bind(emptyItem: EmptyItem?) {
+        binding.emptyIconView.setColorFilter(ContextCompat.getColor(itemView.context, R.color.text_dimmed), android.graphics.PorterDuff.Mode.MULTIPLY)
+        emptyItem?.iconResource?.let { binding.emptyIconView.setImageResource(it) }
+        binding.emptyViewTitle.text = emptyItem?.title
+        binding.emptyViewDescription.text = emptyItem?.text
+
+        val buttonLabel =emptyItem?.buttonLabel
+        if (buttonLabel != null) {
+            binding.button.visibility = View.VISIBLE
+            binding.button.text = buttonLabel
+            binding.button.setOnClickListener { emptyItem.onButtonTap?.invoke() }
+        } else {
+            binding.button.visibility = View.GONE
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
index 3e1d2ed9a..216119ab2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
@@ -9,10 +9,12 @@ import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.view.children
+import androidx.lifecycle.lifecycleScope
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.extensions.dpToPx
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.ui.activities.BaseActivity
 import com.habitrpg.android.habitica.ui.views.login.LockableScrollView
 import com.plattysoft.leonids.ParticleSystem
 import kotlinx.coroutines.Dispatchers
@@ -289,10 +291,11 @@ open class HabiticaAlertDialog(context: Context) : AlertDialog(context, R.style.
                 dialogQueue.removeAt(0)
             }
             if (dialogQueue.size > 0) {
-                if ((dialogQueue[0].context as? Activity)?.isFinishing != true) {
-                    GlobalScope.launch(context = Dispatchers.Main) {
+                if ((dialogQueue[0].context as? BaseActivity)?.isFinishing != true) {
+                    (dialogQueue[0].context as? BaseActivity)?.lifecycleScope?.launch(context = Dispatchers.Main) {
                         delay(500L)
-                        if (dialogQueue.size > 0 && (dialogQueue[0].context as? Activity)?.isFinishing == false) {
+                        if (dialogQueue.size > 0 && ((dialogQueue[0].context as? Activity)?.isFinishing == false ||
+                                ((dialogQueue[0].context as? ContextThemeWrapper)?.baseContext as? Activity)?.isFinishing == false)) {
                             dialogQueue[0].show()
                         }
                     }