sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-19 20:29:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hide guild invite button until we can investigate the issue

Browse source
This commit is contained in:
Phillip Thelen 2023-06-07 14:01:44 +02:00
parent 60646c6835
commit 93545bb3d9
2 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Habitica/res/layout/fragment_guild_detail.xml
View file

@ -109,13 +109,6 @@
android:paddingBottom="12dp"
android:orientation="horizontal"
android:gravity="center_vertical">
<Button
android:id="@+id/invite_button"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/invite_to_guild"
style="@style/HabiticaButton.Purple" />
<Button
android:id="@+id/join_button"
android:layout_width="0dp"

24
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildDetailFragment.kt
View file

@ -1,14 +1,12 @@
package com.habitrpg.android.habitica.ui.fragments.social.guilds
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.text.method.LinkMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.lifecycleScope
@ -65,9 +63,9 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
binding?.refreshLayout?.setOnRefreshListener { this.refresh() }
viewModel.getGroupData().observe(viewLifecycleOwner, { updateGuild(it) })
viewModel.getLeaderData().observe(viewLifecycleOwner, { setLeader(it) })
viewModel.getIsMemberData().observe(viewLifecycleOwner, { updateMembership(it) })
viewModel.getGroupData().observe(viewLifecycleOwner) { updateGuild(it) }
viewModel.getLeaderData().observe(viewLifecycleOwner) { setLeader(it) }
viewModel.getIsMemberData().observe(viewLifecycleOwner) { updateMembership(it) }
binding?.guildDescription?.movementMethod = LinkMovementMethod.getInstance()
binding?.guildSummary?.movementMethod = LinkMovementMethod.getInstance()
@ -80,10 +78,6 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
(this.activity as? SnackbarActivity)?.showSnackbar(title = getString(R.string.joined_guild))
}
}
binding?.inviteButton?.setOnClickListener {
val intent = Intent(activity, GroupInviteActivity::class.java)
sendInvitesResult.launch(intent)
}
binding?.leaderWrapper?.setOnClickListener {
viewModel.leaderID?.let { leaderID ->
val profileDirections = MainNavDirections.openProfileActivity(leaderID)
@ -112,7 +106,7 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
val inviteData = HashMap<String, Any>()
inviteData["inviter"] = viewModel.user.value?.profile?.name ?: ""
val emails = it.data?.getStringArrayExtra(GroupInviteActivity.EMAILS_KEY)
if (emails != null && emails.isNotEmpty()) {
if (!emails.isNullOrEmpty()) {
val invites = ArrayList<HashMap<String, String>>()
emails.forEach { email ->
val invite = HashMap<String, String>()
@ -123,7 +117,7 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
inviteData["emails"] = invites
}
val userIDs = it.data?.getStringArrayExtra(GroupInviteActivity.USER_IDS_KEY)
if (userIDs != null && userIDs.isNotEmpty()) {
if (!userIDs.isNullOrEmpty()) {
val invites = ArrayList<String>()
userIDs.forEach { invites.add(it) }
inviteData["usernames"] = invites
@ -164,10 +158,10 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
alert.setTitle(R.string.guild_challenges)
alert.setMessage(R.string.leave_guild_challenges_confirmation)
alert.addButton(R.string.keep_challenges, true) { _, _ ->
viewModel?.leaveGroup(groupChallenges, true) { showLeaveSnackbar() }
viewModel.leaveGroup(groupChallenges, true) { showLeaveSnackbar() }
}
alert.addButton(R.string.leave_challenges_delete_tasks, isPrimary = false, isDestructive = true) { _, _ ->
viewModel?.leaveGroup(groupChallenges, false) { showLeaveSnackbar() }
viewModel.leaveGroup(groupChallenges, false) { showLeaveSnackbar() }
}
alert.setExtraCloseButtonVisibility(View.VISIBLE)
alert.show()
@ -176,7 +170,7 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
alert.setTitle(R.string.leave_guild_confirmation)
alert.setMessage(R.string.rejoin_guild)
alert.addButton(R.string.leave, isPrimary = true, isDestructive = true) { _, _ ->
viewModel?.leaveGroup(groupChallenges, false) {
viewModel.leaveGroup(groupChallenges, false) {
showLeaveSnackbar()
}
}
@ -199,8 +193,6 @@ class GuildDetailFragment : BaseFragment<FragmentGuildDetailBinding>() {
binding?.guildBankText?.text = guild?.gemCount.toString()
binding?.guildSummary?.setMarkdown(guild?.summary)
binding?.guildDescription?.setMarkdown(guild?.description)
binding?.inviteButton?.isVisible = guild?.isGroupPlan != true
}
companion object {