Added ways to remove encounter

Author: fmasa

app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/encounters/EncounterDetailFragment.kt

@@ -5,18 +5,25 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
+import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.observe
+import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import cz.muni.fi.rpg.R
 import cz.muni.fi.rpg.model.domain.encounter.Encounter
 import cz.muni.fi.rpg.model.right
 import cz.muni.fi.rpg.ui.common.BaseFragment
 import cz.muni.fi.rpg.viewModels.EncounterDetailViewModel
 import kotlinx.android.synthetic.main.fragment_encounter_detail.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.koin.android.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 
-class EncounterDetailFragment : BaseFragment(R.layout.fragment_encounter_detail) {
+class EncounterDetailFragment : BaseFragment(R.layout.fragment_encounter_detail),
+    CoroutineScope by CoroutineScope(Dispatchers.Default) {
 
     private val args: EncounterDetailFragmentArgs by navArgs()
 
@@ -39,18 +46,33 @@ class EncounterDetailFragment : BaseFragment(R.layout.fragment_encounter_detail)
             this.encounter = encounter
         }
     }
+
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
 
-        inflater.inflate(R.menu.edit_menu, menu)
+        inflater.inflate(R.menu.encounter_menu, menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == R.id.actionEdit) {
-            EncounterDialog.newInstance(
-                args.encounterId.partyId,
-                EncounterDialog.Defaults(encounter.id, encounter.name, encounter.description)
-            ).show(childFragmentManager, null)
+        when (item.itemId) {
+            R.id.actionEdit -> {
+                EncounterDialog.newInstance(
+                    args.encounterId.partyId,
+                    EncounterDialog.Defaults(encounter.id, encounter.name, encounter.description)
+                ).show(childFragmentManager, null)
+            }
+            R.id.actionRemove -> {
+                AlertDialog.Builder(requireContext())
+                    .setMessage(R.string.question_remove_encounter)
+                    .setPositiveButton(R.string.remove) { _, _ ->
+                        launch {
+                            viewModel.remove()
+                            withContext(Dispatchers.Main) { findNavController().popBackStack() }
+                        }
+                    }.setNegativeButton(R.string.button_cancel, null)
+                    .create()
+                    .show()
+            }
         }
 
         return super.onOptionsItemSelected(item)

app/src/main/java/cz/muni/fi/rpg/viewModels/EncounterDetailViewModel.kt

@@ -19,4 +19,8 @@ class EncounterDetailViewModel(
 
     val party: LiveData<Either<PartyNotFound, Party>> = parties.getLive(encounterId.partyId)
     val encounter: LiveData<Either<EncounterNotFound, Encounter>> = encounters.getLive(encounterId)
+
+    suspend fun remove() {
+        encounters.remove(encounterId)
+    }
 }

app/src/main/res/menu/encounter_menu.xml

@@ -0,0 +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/actionEdit"
+        android:title="@string/button_edit"
+        android:icon="@drawable/ic_edit"
+        app:showAsAction="always" />
+    <item android:id="@+id/actionRemove"
+        android:title="@string/remove"/>
+</menu>

app/src/main/res/values/strings.xml

@@ -220,4 +220,5 @@
     <string name="label_character_note">Additional notes</string>
     <string name="label_character_note_input">Additional notes (Optional)</string>
     <string name="title_checkbox_hardy">Hardy (Increase maximum wounds by TB)</string>
+    <string name="question_remove_encounter">Do you really want to remove this encounter?</string>
 </resources>

firebase/firestore.rules

@@ -16,9 +16,14 @@ service cloud.firestore {
 
             match /encounters/{encounterId} {
                 allow read: if hasAccessToParty();
-                allow write: if isValidEncounter(request.resource.data)
+                allow create: if isValidEncounter(request.resource.data)
                             && hasAccessToParty()
                             && isGameMaster();
+                allow update: if isValidEncounter(request.resource.data)
+                              && hasAccessToParty()
+                              && isGameMaster();
+                allow delete: if hasAccessToParty() && isGameMaster();
+
 
                 function isValidEncounter(encounter) {
                     return encounter is map

firebase/tests/Encounters.ts

@@ -29,6 +29,22 @@ class Encounters extends Suite {
         )
     }
 
+    @test
+    async "GM can remove encounters"() {
+        const party = await this.createValidParty();
+        const encounter = this.validEncounter();
+
+        const document = this.authedApp(this.validPartyGameMasterId)
+            .collection("parties")
+            .doc(party.id)
+            .collection("encounters")
+            .doc(encounter.id);
+
+        await document.set(encounter)
+
+        await assertSucceeds(document.delete())
+    }
+
     @test
     async "Player CANNOT create encounters"() {
         const userId = "user123"