From aa54bef02c1641a6cacdfee01b25dfa809819495 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 22 Aug 2018 20:02:11 +0200
Subject: [PATCH] Add pull-to-refresh to empty party view. Fixes #1017

---
 Habitica/res/layout/fragment_group_info.xml   | 414 +++++++++---------
 .../habitica/ui/activities/MainActivity.kt    |   2 +-
 .../social/GroupInformationFragment.kt        |  22 +-
 3 files changed, 229 insertions(+), 209 deletions(-)

diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 36c106434..3840d5a48 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -1,232 +1,236 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-                                            android:layout_width="match_parent"
-                                            android:layout_height="match_parent"
-                                            android:scrollbarSize="3dp"
-                                            android:scrollbarThumbVertical="@color/scrollbarThumb"
-                                            android:scrollbars="vertical">
-
-    <LinearLayout
+<android.support.v4.widget.SwipeRefreshLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/refreshLayout">
+    <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="?android:actionBarSize">
-
-        <android.support.v7.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/CardView.Default"
-            android:id="@+id/invitationWrapper">
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                style="@style/CardContent">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/invited_to_party" />
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_gravity="right">
-
-                    <Button
-                        android:id="@+id/buttonPartyInviteAccept"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/quest.accept"
-                        android:textColor="@color/btn_success"
-                        style="?android:buttonBarButtonStyle" />
-
-                    <Button
-                        android:id="@+id/buttonPartyInviteReject"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/quest.reject"
-                        android:textColor="@color/btn_danger"
-                        style="?android:buttonBarButtonStyle" />
-                </LinearLayout>
-            </LinearLayout>
-        </android.support.v7.widget.CardView>
-
+        android:layout_height="match_parent"
+        android:scrollbarSize="3dp"
+        android:scrollbarThumbVertical="@color/scrollbarThumb"
+        android:scrollbars="vertical">
         <LinearLayout
-            android:id="@+id/noPartyWrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_margin="@dimen/spacing_large">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/Title1"
-                    android:text="@string/no_party_title"
-                    android:gravity="center"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/Body1"
-                    android:text="@string/no_party_description"
-                    android:textColor="@color/gray_300"
-                    android:gravity="center"/>
-                <Button
-                    android:id="@+id/craetePartyButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/HabiticaButton.Gray.600"
-                    android:text="@string/create_party_website"
-                    android:layout_marginTop="@dimen/spacing_large"/>
-            </LinearLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/gray_500"/>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_margin="@dimen/spacing_large">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/Title2"
-                    android:text="@string/join_party_title"
-                    android:gravity="center"/>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/Body1"
-                    android:text="@string/join_party_description"
-                    android:textColor="@color/gray_300"
-                    android:gravity="center"/>
+            android:orientation="vertical"
+            android:paddingBottom="?android:actionBarSize">
 
-                <TextView
-                    android:id="@+id/userIdView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/brand_400"
-                    android:gravity="center"
-                    android:layout_marginTop="@dimen/spacing_large"
-                    android:layout_marginBottom="@dimen/spacing_large"/>
-                <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default"
+                android:id="@+id/invitationWrapper">
+
+                <LinearLayout
                     android:orientation="vertical"
-                    android:id="@+id/qrLayout"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-                    <FrameLayout
-                        android:orientation="vertical"
-                        android:layout_width="fill_parent"
-                        android:layout_height="300dp"
-                        android:id="@+id/qrCodeWrapper">
-
-                        <com.facebook.drawee.view.SimpleDraweeView
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:id="@+id/QRImageView"
-                            android:layout_gravity="center" />
-
-                        <RelativeLayout
-                            android:orientation="vertical"
-                            android:layout_width="60dp"
-                            android:layout_height="60dp"
-                            android:layout_gravity="center"
-                            android:background="@color/white"
-                            android:clipChildren="true"
-                            android:padding="1dp"
-                            android:visibility="gone"
-                            >
-                            <com.habitrpg.android.habitica.ui.AvatarView
-                                android:id="@+id/avatarView"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_centerHorizontal="true"
-                                android:layout_centerVertical="true"
-                                />
-                        </RelativeLayout>
-                    </FrameLayout>
-
-                    <Button
-                        android:id="@+id/QRDownloadButton"
+                    android:layout_height="match_parent"
+                    style="@style/CardContent">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/invited_to_party" />
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/download"
-                        style="@style/HabiticaButton.Gray.600"
-                        android:layout_marginTop="20dp"
-                        android:layout_gravity="center_horizontal|bottom"
-                        />
+                        android:orientation="horizontal"
+                        android:layout_gravity="right">
 
+                        <Button
+                            android:id="@+id/buttonPartyInviteAccept"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.accept"
+                            android:textColor="@color/btn_success"
+                            style="?android:buttonBarButtonStyle" />
+
+                        <Button
+                            android:id="@+id/buttonPartyInviteReject"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.reject"
+                            android:textColor="@color/btn_danger"
+                            style="?android:buttonBarButtonStyle" />
+                    </LinearLayout>
                 </LinearLayout>
-            </LinearLayout>
-        </LinearLayout>
+            </android.support.v7.widget.CardView>
 
-        <TextView
-            android:id="@+id/groupNameView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/SectionTitle"/>
-
-        <android.support.v7.widget.CardView
-            android:id="@+id/groupDescriptionWrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/CardView.Default">
             <LinearLayout
+                android:id="@+id/noPartyWrapper"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/CardContent"
-                android:divider="?android:listDivider"
-                android:showDividers="middle"
                 android:orientation="vertical">
-
-                <net.pherth.android.emoji_library.EmojiTextView
-                    android:id="@+id/groupDescriptionView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-
                 <LinearLayout
-                    android:id="@+id/leadernameWrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:layout_margin="@dimen/spacing_large">
                     <TextView
-                        android:id="@+id/leadernameTextView"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/leaderMessageWrapper"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                    <net.pherth.android.emoji_library.EmojiTextView
-                        android:id="@+id/leaderMessageTextView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:id="@+id/gemCountWrapper"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-                    <TextView
-                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="@string/gems"/>
+                        style="@style/Title1"
+                        android:text="@string/no_party_title"
+                        android:gravity="center"/>
                     <TextView
-                        android:id="@+id/gemCountTextView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/Body1"
+                        android:text="@string/no_party_description"
+                        android:textColor="@color/gray_300"
+                        android:gravity="center"/>
+                    <Button
+                        android:id="@+id/craetePartyButton"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/HabiticaButton.Gray.600"
+                        android:text="@string/create_party_website"
+                        android:layout_marginTop="@dimen/spacing_large"/>
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/gray_500"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_margin="@dimen/spacing_large">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/Title2"
+                        android:text="@string/join_party_title"
+                        android:gravity="center"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/Body1"
+                        android:text="@string/join_party_description"
+                        android:textColor="@color/gray_300"
+                        android:gravity="center"/>
+
+                    <TextView
+                        android:id="@+id/userIdView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/brand_400"
+                        android:gravity="center"
+                        android:layout_marginTop="@dimen/spacing_large"
+                        android:layout_marginBottom="@dimen/spacing_large"/>
+                    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                        android:orientation="vertical"
+                        android:id="@+id/qrLayout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+                        <FrameLayout
+                            android:orientation="vertical"
+                            android:layout_width="fill_parent"
+                            android:layout_height="300dp"
+                            android:id="@+id/qrCodeWrapper">
+
+                            <com.facebook.drawee.view.SimpleDraweeView
+                                android:layout_width="wrap_content"
+                                android:layout_height="match_parent"
+                                android:id="@+id/QRImageView"
+                                android:layout_gravity="center" />
+
+                            <RelativeLayout
+                                android:orientation="vertical"
+                                android:layout_width="60dp"
+                                android:layout_height="60dp"
+                                android:layout_gravity="center"
+                                android:background="@color/white"
+                                android:clipChildren="true"
+                                android:padding="1dp"
+                                android:visibility="gone"
+                                >
+                                <com.habitrpg.android.habitica.ui.AvatarView
+                                    android:id="@+id/avatarView"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_centerHorizontal="true"
+                                    android:layout_centerVertical="true"
+                                    />
+                            </RelativeLayout>
+                        </FrameLayout>
+
+                        <Button
+                            android:id="@+id/QRDownloadButton"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/download"
+                            style="@style/HabiticaButton.Gray.600"
+                            android:layout_marginTop="20dp"
+                            android:layout_gravity="center_horizontal|bottom"
+                            />
+
+                    </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
-    </LinearLayout>
-</android.support.v4.widget.NestedScrollView>
+            <TextView
+                android:id="@+id/groupNameView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/SectionTitle"/>
+
+            <android.support.v7.widget.CardView
+                android:id="@+id/groupDescriptionWrapper"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/CardContent"
+                    android:divider="?android:listDivider"
+                    android:showDividers="middle"
+                    android:orientation="vertical">
+
+                    <net.pherth.android.emoji_library.EmojiTextView
+                        android:id="@+id/groupDescriptionView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                    <LinearLayout
+                        android:id="@+id/leadernameWrapper"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+                        <TextView
+                            android:id="@+id/leadernameTextView"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/leaderMessageWrapper"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+                        <net.pherth.android.emoji_library.EmojiTextView
+                            android:id="@+id/leaderMessageTextView"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/gemCountWrapper"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/gems"/>
+                        <TextView
+                            android:id="@+id/gemCountTextView"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"/>
+                    </LinearLayout>
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+        </LinearLayout>
+    </android.support.v4.widget.NestedScrollView>
+</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index 7fb865901..5ec9c77af 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -899,7 +899,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
         val imageView = view.findViewById<View>(R.id.imageView) as? SimpleDraweeView
         var imageKey = event.notification.data.rewardKey[0]
         if (imageKey.contains("armor")) {
-            imageKey = "slim_imageKey"
+            imageKey = "slim_$imageKey"
         }
         DataBindingUtils.loadImage(imageView, imageKey)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
index 4796e1a35..0428df06a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
@@ -48,6 +48,9 @@ class GroupInformationFragment : BaseFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+
+        refreshLayout?.setOnRefreshListener { this.refresh() }
+
         if (user != null) {
             setUser(user)
         } else {
@@ -64,7 +67,7 @@ class GroupInformationFragment : BaseFragment() {
             qrCodeManager.setUpView(qrLayout)
         }
 
-        buttonPartyInviteAccept.setOnClickListener {
+        buttonPartyInviteAccept.setOnClickListener { _ ->
             val userId = user?.invitations?.party?.id
             if (userId != null) {
                 socialRepository.joinGroup(userId)
@@ -76,7 +79,7 @@ class GroupInformationFragment : BaseFragment() {
             }
         }
 
-        buttonPartyInviteReject.setOnClickListener {
+        buttonPartyInviteReject.setOnClickListener { _ ->
             val userId = user?.invitations?.party?.id
             if (userId != null) {
                 socialRepository.rejectGroupInvite(userId)
@@ -84,7 +87,7 @@ class GroupInformationFragment : BaseFragment() {
             }
         }
 
-        userIdView.setOnClickListener {
+        userIdView.setOnClickListener { _ ->
             val clipboard = context?.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
             val clip = ClipData.newPlainText(context?.getString(R.string.user_id), user?.id)
             clipboard?.primaryClip = clip
@@ -100,6 +103,19 @@ class GroupInformationFragment : BaseFragment() {
         }
     }
 
+    private fun refresh() {
+        if (group != null) {
+            socialRepository.retrieveGroup(group?.id ?: "").subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
+        } else {
+            userRepository.retrieveUser(false, forced = true)
+                    .filter { it.hasParty() }
+                    .flatMap { socialRepository.retrieveGroup("party") }
+                    .flatMap<List<Member>> { group1 -> socialRepository.retrieveGroupMembers(group1.id, true) }
+                    .doOnComplete { refreshLayout.isRefreshing = false }
+                    .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError())
+        }
+    }
+
     private fun setUser(user: User?) {
         if (group == null && user?.invitations?.party?.id != null) {
             setInvitation(user.invitations?.party)