Merge branch 'feat/rename-party' into 'master'

fmasa · fmasa · commit 28e2e22c352c · 2020-06-22T22:15:35.000Z
Feat/rename party Closes #31 See merge request fmasa/pv239-project!67
diff --git a/app/src/main/java/cz/muni/fi/rpg/model/domain/party/Party.kt b/app/src/main/java/cz/muni/fi/rpg/model/domain/party/Party.kt
@@ -1,15 +1,18 @@
 package cz.muni.fi.rpg.model.domain.party
+import android.os.Parcelable
 import cz.muni.fi.rpg.model.domain.common.Ambitions
 import cz.muni.fi.rpg.model.generateAccessCode
+import kotlinx.android.parcel.Parcelize
 import java.util.*
 
+@Parcelize
 data class Party(
     val id: UUID,
-    val name: String,
+    private var name: String,
     val gameMasterId: String?,
     val users: Set<String>,
     private var ambitions: Ambitions = Ambitions("", "")
-) {
+) : Parcelable {
     companion object {
         const val NAME_MAX_LENGTH = 50
 
@@ -44,6 +47,14 @@ data class Party(
         this.ambitions = ambitions
     }
 
+    fun rename(name: String) {
+        this.name = name
+    }
+
+    fun getName(): String {
+        return name;
+    }
+
     fun getAmbitions() = ambitions
 
     fun getInvitation() = Invitation(id, name, accessCode)
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/character/CharacterFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/character/CharacterFragment.kt
@@ -46,7 +46,7 @@ class CharacterFragment(
         }
 
         viewModel.party.right()
-            .observe(viewLifecycleOwner) { setSubtitle(it.name) }
+            .observe(viewLifecycleOwner) { setSubtitle(it.getName()) }
 
         pager.adapter = StaticFragmentsViewPagerAdapter(
             this,
@@ -90,7 +90,7 @@ class CharacterFragment(
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
 
-        inflater.inflate(R.menu.character_menu, menu)
+        inflater.inflate(R.menu.edit_menu, menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/GameMasterFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/GameMasterFragment.kt
@@ -1,7 +1,11 @@
 package cz.muni.fi.rpg.ui.gameMaster
 
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
 import android.view.View
+import android.widget.Toast
 import androidx.lifecycle.observe
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
@@ -28,6 +32,8 @@ class GameMasterFragment(
 
     private val viewModel: GameMasterViewModel by viewModel { parametersOf(args.partyId) }
 
+    private lateinit var partyName: String
+
     private lateinit var invitation: Invitation
 
     private fun setViewVisibility(view: View, visible: Boolean) {
@@ -46,7 +52,7 @@ class GameMasterFragment(
 
 
         viewModel.party.right().observe(viewLifecycleOwner) { party ->
-            setTitle(party.name)
+            setTitle(party.getName())
             invitation = party.getInvitation()
 
             inviteButton.isEnabled = true
@@ -59,6 +65,10 @@ class GameMasterFragment(
                         viewModel.updatePartyAmbitions(it)
                     }.show(childFragmentManager, "ChangeAmbitionsDialog")
             }
+
+
+            partyName = party.getName()
+            setHasOptionsMenu(true)
         }
 
         inviteButton.setOnClickListener { showQrCode() }
@@ -85,6 +95,20 @@ class GameMasterFragment(
         }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+
+        inflater.inflate(R.menu.edit_menu, menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.actionEdit) {
+            RenamePartyDialog.newInstance(args.partyId, partyName).show(childFragmentManager, null)
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
     private fun showQrCode() {
         InvitationDialog(invitation, jsonMapper)
             .show(requireActivity().supportFragmentManager, InvitationDialog::class.simpleName)
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/RenamePartyDialog.kt b/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/RenamePartyDialog.kt
@@ -0,0 +1,112 @@
+package cz.muni.fi.rpg.ui.gameMaster
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.core.os.bundleOf
+import androidx.fragment.app.DialogFragment
+import cz.muni.fi.rpg.R
+import cz.muni.fi.rpg.model.domain.common.CouldNotConnectToBackend
+import cz.muni.fi.rpg.model.domain.party.Party
+import cz.muni.fi.rpg.ui.common.forms.Form
+import cz.muni.fi.rpg.viewModels.GameMasterViewModel
+import kotlinx.android.synthetic.main.dialog_party_rename.view.*
+import kotlinx.coroutines.*
+import org.koin.android.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+import timber.log.Timber
+import java.util.*
+
+class RenamePartyDialog : DialogFragment(), CoroutineScope by CoroutineScope(Dispatchers.Main) {
+    companion object {
+        fun newInstance(partyId: UUID, currentName: String) = RenamePartyDialog().apply {
+            arguments = bundleOf(
+                "partyId" to partyId,
+                "currentName" to currentName
+            )
+        }
+    }
+
+    private val viewModel: GameMasterViewModel by viewModel {
+        parametersOf(requireArguments().getSerializable("partyId"))
+    }
+
+    private val currentName: String by lazy { requireArguments().getString("currentName") ?: "" }
+
+    private var pendingJob: Job? = null
+
+    private lateinit var form: Form
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val activity = requireActivity()
+
+        val inflater = activity.layoutInflater
+
+        val view = inflater.inflate(R.layout.dialog_party_rename, null)
+
+        form = Form(requireContext()).apply {
+            addTextInput(view.partyNameInput).apply {
+                setMaxLength(Party.NAME_MAX_LENGTH)
+                setDefaultValue(currentName)
+                addLiveRule(R.string.error_party_name_blank) { !it.isNullOrBlank() }
+            }
+        }
+
+        val dialog = AlertDialog.Builder(activity)
+            .setTitle(R.string.title_party_rename)
+            .setView(view)
+            .setPositiveButton(R.string.button_save) { _, _ -> }
+            .create()
+
+        dialog.setOnShowListener {
+            dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
+                dialogSubmitted(dialog, view)
+            }
+        }
+
+        return dialog
+    }
+
+    private fun dialogSubmitted(dialog: AlertDialog, view: View) {
+        if (!form.validate()) {
+            return
+        }
+
+        val partyName = view.partyNameInput.getValue()
+
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = false
+        view.progress.visibility = View.VISIBLE
+        view.partyNameInput.visibility = View.GONE
+
+        Timber.d("Dialog submitted, trying to update party name")
+
+        pendingJob = launch {
+            try {
+                viewModel.renameParty(partyName)
+                toast(getString(R.string.message_party_updated))
+                Timber.d(tag, "Party was renamed")
+            } catch (e: CouldNotConnectToBackend) {
+                Timber.i(e, "User could not rename party, because (s)he is offline")
+                toast(getString(R.string.error_party_update_no_connection))
+            } catch (e: Throwable) {
+                toast(getString(R.string.error_unkown))
+                Timber.e(e)
+            } finally {
+                withContext(Dispatchers.Main) { dismiss() }
+            }
+        }
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+
+        pendingJob?.cancel()
+    }
+
+    private suspend fun toast(message: String) = withContext(Dispatchers.Main) {
+        Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show()
+    }
+}
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/partyList/AssemblePartyDialog.kt b/app/src/main/java/cz/muni/fi/rpg/ui/partyList/AssemblePartyDialog.kt
@@ -37,7 +37,7 @@ class AssemblePartyDialog(
         form = Form(requireContext()).apply {
             addTextInput(view.partyNameInput).apply {
                 setMaxLength(Party.NAME_MAX_LENGTH)
-                addLiveRule(R.string.assembleParty_party_name_blank) {
+                addLiveRule(R.string.error_party_name_blank) {
                     !it.isNullOrBlank()
                 }
             }
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/partyList/adapter/PartyHolder.kt b/app/src/main/java/cz/muni/fi/rpg/ui/partyList/adapter/PartyHolder.kt
@@ -11,7 +11,7 @@ class PartyHolder(
     private val onClickListener: EntityListener<Party>
 ) : RecyclerView.ViewHolder(view) {
     fun bind(item: Party) {
-        view.party_item_title.text = item.name
+        view.party_item_title.text = item.getName()
 
         val playersCount = item.getPlayerCounts()
 
diff --git a/app/src/main/java/cz/muni/fi/rpg/viewModels/GameMasterViewModel.kt b/app/src/main/java/cz/muni/fi/rpg/viewModels/GameMasterViewModel.kt
@@ -52,6 +52,14 @@ class GameMasterViewModel(
         }
     }
 
+    suspend fun renameParty(newName: String) {
+        val party = parties.get(partyId)
+
+        party.rename(newName)
+
+        parties.save(party)
+    }
+
     suspend fun updatePartyAmbitions(ambitions: Ambitions) {
         val party = parties.get(partyId)
 
diff --git a/app/src/main/res/layout/dialog_party_rename.xml b/app/src/main/res/layout/dialog_party_rename.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="@dimen/dialogPadding">
+
+    <ProgressBar
+        android:id="@+id/progress"
+        android:layout_width="match_parent"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:layout_height="match_parent" />
+
+    <cz.muni.fi.rpg.ui.views.TextInput
+        android:id="@+id/partyNameInput"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:inputLabel="@string/label_party_name" />
+</FrameLayout>
diff --git a/app/src/main/res/menu/edit_menu.xml b/app/src/main/res/menu/edit_menu.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,10 +9,14 @@
     <!-- end of Common UI elements -->
 
     <string name="assembleParty_title">Assemble New Party</string>
+
+    <!-- Party rename Dialog -->
+    <string name="title_party_rename">Assemble New Party</string>
+
     <string name="label_party_name">Party Name</string>
     <string name="assembleParty_button_positive">create</string>
     <string name="assemblyParty_submit">create</string>
-    <string name="assembleParty_party_name_blank">Party name cannot be empty</string>
+    <string name="error_party_name_blank">Party name cannot be empty</string>
     <string name="scanCode_title">Join using QR code</string>
     <string name="group_icon_description">Group icon</string>
     <string name="skill_icon_description">Icon with characteristic related to this skill</string>
@@ -125,6 +129,7 @@
     <string name="error_value_over_100">Cannot be higher than 100</string>
     <string name="error_value_over_max">Cannot be higher than maximum value</string>
     <string name="error_party_creation_no_connection">You need to be connected to internet to create parties</string>
+    <string name="error_party_update_no_connection">You need to be connected to internet to update party</string>
     <string name="title_character_skills">Skills</string>
     <string name="title_character_talents">Talents</string>
     <string name="title_character_spells">Spells</string>
@@ -191,4 +196,5 @@
     <string name="label_motivation">Motivation</string>
     <string name="share_link">Share link</string>
     <string name="waiting_for_character">Waiting for player to create character</string>
+    <string name="message_party_updated">Party was updated</string>
 </resources>
diff --git a/firebase/firestore.rules b/firebase/firestore.rules
@@ -203,10 +203,14 @@ service cloud.firestore {
                     && ambitions.longTerm is string && ambitions.longTerm.size() <= 400;
             }
 
+            function isValidPartyName(name) {
+                return name is string && isNotBlank(name) && name.size() <= 50;
+            }
+
             function isValidNewParty(party, uid) {
                 return party.keys().toSet() == ["id", "name", "users", "gameMasterId", "accessCode", "ambitions"].toSet()
                     && party.id is string && party.id == partyId && isValidUuid(party.id)
-                    && party.name is string && isNotBlank(party.name) && party.name.size() <= 50
+                    && isValidPartyName(party.name)
                     && party.users == [uid]
                     && (party.gameMasterId == uid || party.gameMasterId == null)
                     && party.accessCode is string && party.accessCode != ""
@@ -217,8 +221,9 @@ service cloud.firestore {
                 let party = request.resource.data;
                 let diff = resource.data.diff(request.resource.data);
 
-                return ["ambitions"].toSet().hasAll(diff.affectedKeys())
-                    && areAmbitionsValid(party.ambitions);
+                return ["ambitions", "name"].toSet().hasAll(diff.affectedKeys())
+                    && areAmbitionsValid(party.ambitions)
+                    && isValidPartyName(party.name);
             }
 
             function invitation(party) {
diff --git a/firebase/tests/rulesTest.ts b/firebase/tests/rulesTest.ts
@@ -619,6 +619,30 @@ class Parties extends Suite {
             document.update("ambitions", {shortTerm: "Completely new ambitions!", longTerm: "We don't think that far"})
         )
     }
+
+    @test
+    async "should let GM rename party"() {
+        const party = await createValidParty();
+
+        const document = authedApp(party.gameMasterId)
+            .collection("parties")
+            .doc(party.id);
+
+        await firebase.assertSucceeds(document.update("name", "New cool name"))
+    }
+
+
+    @test
+    async "should NOT let player rename party"() {
+        const userId = "user123";
+        const party = await createUserAccessibleParty(userId);
+
+        const document = authedApp(userId)
+            .collection("parties")
+            .doc(party.id);
+
+        await firebase.assertFails(document.update("name", "New cool name"))
+    }
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class CharacterFragment(`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`viewModel.party.right()`
`49`		`- .observe(viewLifecycleOwner) { setSubtitle(it.name) }`
	`49`	`+ .observe(viewLifecycleOwner) { setSubtitle(it.getName()) }`
`50`	`50`
`51`	`51`	`pager.adapter = StaticFragmentsViewPagerAdapter(`
`52`	`52`	`this,`
`@@ -90,7 +90,7 @@ class CharacterFragment(`
`90`	`90`	`override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {`
`91`	`91`	`super.onCreateOptionsMenu(menu, inflater)`
`92`	`92`
`93`		`- inflater.inflate(R.menu.character_menu, menu)`
	`93`	`+ inflater.inflate(R.menu.edit_menu, menu)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`override fun onOptionsItemSelected(item: MenuItem): Boolean {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class AssemblePartyDialog(`
`37`	`37`	`form = Form(requireContext()).apply {`
`38`	`38`	`addTextInput(view.partyNameInput).apply {`
`39`	`39`	`setMaxLength(Party.NAME_MAX_LENGTH)`
`40`		`- addLiveRule(R.string.assembleParty_party_name_blank) {`
	`40`	`+ addLiveRule(R.string.error_party_name_blank) {`
`41`	`41`	`!it.isNullOrBlank()`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,14 @@ class GameMasterViewModel(`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ suspend fun renameParty(newName: String) {`
	`56`	`+ val party = parties.get(partyId)`
	`57`	`+`
	`58`	`+ party.rename(newName)`
	`59`	`+`
	`60`	`+ parties.save(party)`
	`61`	`+ }`
	`62`	`+`
`55`	`63`	`suspend fun updatePartyAmbitions(ambitions: Ambitions) {`
`56`	`64`	`val party = parties.get(partyId)`
`57`	`65`