From 9ce02b189f288bf70e3eb767dd80c5a369350cd9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Thu, 7 Nov 2019 15:37:02 +0100
Subject: [PATCH] Add refresh button to group menus

---
 Habitica/build.gradle                                       | 2 +-
 Habitica/res/menu/guild_admin.xml                           | 6 +++++-
 Habitica/res/menu/guild_member.xml                          | 5 +++++
 Habitica/res/menu/menu_party.xml                            | 5 +++++
 Habitica/res/menu/menu_party_admin.xml                      | 5 +++++
 Habitica/res/menu/menu_public_guild.xml                     | 1 -
 .../android/habitica/ui/fragments/social/GuildFragment.kt   | 4 ++++
 .../habitica/ui/fragments/social/party/PartyFragment.kt     | 4 ++++
 8 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 3699c5442..0f25a56a3 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -151,7 +151,7 @@ android {
         multiDexEnabled true
         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 2292
+        versionCode 2294
         versionName "2.3"
     }
 
diff --git a/Habitica/res/menu/guild_admin.xml b/Habitica/res/menu/guild_admin.xml
index dfe41bfb9..03c7c1b2f 100644
--- a/Habitica/res/menu/guild_admin.xml
+++ b/Habitica/res/menu/guild_admin.xml
@@ -6,5 +6,9 @@
         android:orderInCategory="1"
         app:showAsAction="never"
         android:title="@string/action_edit" />
-
+    <item
+        android:id="@+id/menu_guild_refresh"
+        android:orderInCategory="1"
+        app:showAsAction="never"
+        android:title="@string/action_refresh" />
 </menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/guild_member.xml b/Habitica/res/menu/guild_member.xml
index 81d86020d..031a5829f 100644
--- a/Habitica/res/menu/guild_member.xml
+++ b/Habitica/res/menu/guild_member.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_guild_refresh"
+        android:orderInCategory="1"
+        app:showAsAction="never"
+        android:title="@string/action_refresh" />
     <item
         android:id="@+id/menu.guild.leave"
         android:orderInCategory="1"
diff --git a/Habitica/res/menu/menu_party.xml b/Habitica/res/menu/menu_party.xml
index 893f86edc..5f69f78c0 100644
--- a/Habitica/res/menu/menu_party.xml
+++ b/Habitica/res/menu/menu_party.xml
@@ -5,6 +5,11 @@
         android:id="@+id/menu_invite_item"
         android:title="@string/invite"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/menu_guild_refresh"
+        android:orderInCategory="1"
+        app:showAsAction="never"
+        android:title="@string/action_refresh" />
     <item
         android:id="@+id/menu.guild.leave"
         android:orderInCategory="1"
diff --git a/Habitica/res/menu/menu_party_admin.xml b/Habitica/res/menu/menu_party_admin.xml
index c2a58857e..f4fd4422b 100644
--- a/Habitica/res/menu/menu_party_admin.xml
+++ b/Habitica/res/menu/menu_party_admin.xml
@@ -10,6 +10,11 @@
         android:orderInCategory="1"
         app:showAsAction="never"
         android:title="@string/action_edit" />
+    <item
+        android:id="@+id/menu_guild_refresh"
+        android:orderInCategory="1"
+        app:showAsAction="never"
+        android:title="@string/action_refresh" />
     <item
         android:id="@+id/menu.guild.leave"
         android:orderInCategory="1"
diff --git a/Habitica/res/menu/menu_public_guild.xml b/Habitica/res/menu/menu_public_guild.xml
index 2c5a64965..0e9b00484 100644
--- a/Habitica/res/menu/menu_public_guild.xml
+++ b/Habitica/res/menu/menu_public_guild.xml
@@ -3,7 +3,6 @@
       xmlns:app="http://schemas.android.com/apk/res-auto"
       xmlns:tools="http://schemas.android.com/tools"
       tools:context="com.habitrpg.android.habitica.ui.activities.MainActivity">
-
     <item
             android:id="@+id/action_guild_search"
             android:title="@string/guild_search_hint"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt
index 21b089e73..2e064e759 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.kt
@@ -119,6 +119,10 @@ class GuildFragment : BaseMainFragment() {
                 viewModel.retrieveGroup { }
                 return true
             }
+            R.id.menu_guild_refresh -> {
+                viewModel.retrieveGroup {  }
+                return true
+            }
         }
         return super.onOptionsItemSelected(item)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
index fb580b634..2d92e6c93 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.kt
@@ -122,6 +122,10 @@ class PartyFragment : BaseMainFragment() {
                 (detailFragment as? PartyDetailFragment)?.leaveParty()
                 return true
             }
+            R.id.menu_guild_refresh -> {
+                viewModel.retrieveGroup {  }
+                return true
+            }
         }
 
         return super.onOptionsItemSelected(item)