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 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="match_parent"
+ android:scrollbarSize="3dp"
+ android:scrollbarThumbVertical="@color/scrollbarThumb"
+ android:scrollbars="vertical">
-
-
-
-
-
-
-
-
-
+ android:orientation="vertical"
+ android:paddingBottom="?android:actionBarSize">
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+ android:orientation="vertical"
+ android:layout_margin="@dimen/spacing_large">
-
-
-
-
-
-
-
+ style="@style/Title1"
+ android:text="@string/no_party_title"
+ android:gravity="center"/>
+ 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"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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(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> { 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)