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

Mazání Party

Closes #30

See merge request fmasa/pv239-project!87

Author: fmasa

app/src/main/java/cz/muni/fi/rpg/di/container.kt

@@ -103,24 +103,26 @@ val appModule = module {
     viewModel { (characterId: CharacterId) -> ArmorViewModel(characterId, get()) }
     viewModel { (characterId: CharacterId) -> CharacterStatsViewModel(characterId, get()) }
     viewModel { (characterId: CharacterId) -> CharacterMiscViewModel(characterId, get(), get()) }
-    viewModel { (characterId: CharacterId) -> CharacterViewModel(characterId, get(), get())}
+    viewModel { (characterId: CharacterId) -> CharacterViewModel(characterId, get())}
     viewModel { (partyId: UUID) -> GameMasterViewModel(partyId, get(), get()) }
     viewModel { (partyId: UUID) -> EncountersViewModel(partyId, get()) }
-    viewModel { (encounterId: EncounterId) -> EncounterDetailViewModel(encounterId, get(), get(), get()) }
+    viewModel { (partyId: UUID) -> PartyViewModel(partyId, get()) }
+    viewModel { (encounterId: EncounterId) -> EncounterDetailViewModel(encounterId, get(), get()) }
     viewModel { (characterId: CharacterId) -> InventoryViewModel(characterId, get(), get(), get()) }
     viewModel { (characterId: CharacterId) -> SkillsViewModel(characterId, get()) }
     viewModel { (characterId: CharacterId) -> SpellsViewModel(characterId, get()) }
     viewModel { (characterId: CharacterId) -> TalentsViewModel(characterId, get()) }
     viewModel { AuthenticationViewModel(get()) }
     viewModel { JoinPartyViewModel(get()) }
+    viewModel { PartyListViewModel(get()) }
 
     /**
      * Fragments
      */
     fragment { CharacterFragment(get()) }
     fragment { GameMasterFragment(get()) }
     fragment { NavHostFragment() }
-    fragment { PartyListFragment(get()) }
+    fragment { PartyListFragment() }
     fragment { CharacterEditFragment(get()) }
     fragment { CharacterMiscFragment() }
     fragment { CharacterStatsFragment() }

app/src/main/java/cz/muni/fi/rpg/model/domain/party/Party.kt

@@ -11,6 +11,7 @@ data class Party(
     private var name: String,
     val gameMasterId: String?,
     val users: Set<String>,
+    private var archived: Boolean = false,
     private var ambitions: Ambitions = Ambitions("", "")
 ) : Parcelable {
     companion object {
@@ -55,6 +56,12 @@ data class Party(
         return name;
     }
 
+    fun archive() {
+        archived = true
+    }
+
+    fun isArchived() = archived
+
     fun getAmbitions() = ambitions
 
     fun getInvitation() = Invitation(id, name, accessCode)

app/src/main/java/cz/muni/fi/rpg/model/firestore/QueryLiveData.kt

@@ -10,7 +10,8 @@ import kotlinx.coroutines.withContext
 
 internal class QueryLiveData<T: Any>(
     private val query: Query,
-    private val snapshotParser: AggregateMapper<T>
+    private val snapshotParser: AggregateMapper<T>,
+    private val filter: (item: T) -> Boolean = { true }
 ) : MutableLiveData<List<T>>(), CoroutineScope by CoroutineScope(Dispatchers.IO) {
     private var listener: ListenerRegistration? = null
 
@@ -24,6 +25,7 @@ internal class QueryLiveData<T: Any>(
                     val items = snapshot
                         .asIterable()
                         .map(snapshotParser::fromDocumentSnapshot)
+                        .filter(filter)
 
                     withContext(Dispatchers.Main) { value = items }
                 }

app/src/main/java/cz/muni/fi/rpg/model/firestore/repositories/FirestorePartyRepository.kt

@@ -63,9 +63,7 @@ internal class FirestorePartyRepository(
 
     override fun forUser(userId: String): LiveData<List<Party>> =
         QueryLiveData(
-            parties.whereArrayContains(
-                "users",
-                userId
-            ), mapper
-        )
+            parties.whereArrayContains("users", userId),
+            mapper
+        ) { ! it.isArchived() }
 }

app/src/main/java/cz/muni/fi/rpg/ui/character/CharacterFragment.kt

@@ -11,21 +11,21 @@ import androidx.navigation.fragment.navArgs
 import com.google.android.material.tabs.TabLayoutMediator
 import cz.muni.fi.rpg.R
 import cz.muni.fi.rpg.model.domain.character.CharacterNotFound
-import cz.muni.fi.rpg.model.right
 import cz.muni.fi.rpg.ui.character.skills.CharacterSkillsFragment
 import cz.muni.fi.rpg.ui.common.AdManager
-import cz.muni.fi.rpg.ui.common.BaseFragment
+import cz.muni.fi.rpg.ui.common.PartyScopedFragment
 import cz.muni.fi.rpg.ui.common.StaticFragmentsViewPagerAdapter
 import cz.muni.fi.rpg.viewModels.CharacterViewModel
 import kotlinx.android.synthetic.main.fragment_character.*
 import org.koin.android.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import timber.log.Timber
+import java.util.*
 
 
 class CharacterFragment(
     private val adManager: AdManager
-) : BaseFragment(R.layout.fragment_character) {
+) : PartyScopedFragment(R.layout.fragment_character) {
 
     private val args: CharacterFragmentArgs by navArgs()
     private val viewModel: CharacterViewModel by viewModel { parametersOf(args.characterId) }
@@ -45,8 +45,7 @@ class CharacterFragment(
             }
         }
 
-        viewModel.party.right()
-            .observe(viewLifecycleOwner) { setSubtitle(it.getName()) }
+        party.observe(viewLifecycleOwner) { setSubtitle(it.getName()) }
 
         pager.adapter = StaticFragmentsViewPagerAdapter(
             this,
@@ -82,6 +81,8 @@ class CharacterFragment(
         adManager.initializeUnit(characterAdView)
     }
 
+    override fun getPartyId(): UUID = args.characterId.partyId
+
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
 

app/src/main/java/cz/muni/fi/rpg/ui/character/edit/CharacterEditFragment.kt

@@ -11,18 +11,19 @@ import cz.muni.fi.rpg.R
 import cz.muni.fi.rpg.model.domain.character.CharacterRepository
 import cz.muni.fi.rpg.ui.characterCreation.CharacterInfoFormFragment
 import cz.muni.fi.rpg.ui.characterCreation.CharacterStatsFormFragment
-import cz.muni.fi.rpg.ui.common.BaseFragment
+import cz.muni.fi.rpg.ui.common.PartyScopedFragment
 import cz.muni.fi.rpg.ui.common.forms.Form
 import kotlinx.android.synthetic.main.fragment_character_edit.*
 import kotlinx.android.synthetic.main.fragment_character_edit.maxWoundsInput
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.util.*
 
 class CharacterEditFragment(
     private val characters: CharacterRepository
-) : BaseFragment(R.layout.fragment_character_edit),
+) : PartyScopedFragment(R.layout.fragment_character_edit),
     CoroutineScope by CoroutineScope(Dispatchers.Default) {
 
     private val args: CharacterEditFragmentArgs by navArgs()
@@ -69,6 +70,8 @@ class CharacterEditFragment(
         }
     }
 
+    override fun getPartyId(): UUID = args.characterId.partyId
+
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
 

app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterCreationFragment.kt

@@ -1,6 +1,5 @@
 package cz.muni.fi.rpg.ui.characterCreation
 
-import android.content.Context
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
@@ -12,7 +11,7 @@ import com.google.firebase.analytics.ktx.logEvent
 import com.google.firebase.ktx.Firebase
 import cz.muni.fi.rpg.R
 import cz.muni.fi.rpg.model.domain.character.*
-import cz.muni.fi.rpg.ui.common.BaseFragment
+import cz.muni.fi.rpg.ui.common.PartyScopedFragment
 import cz.muni.fi.rpg.ui.common.StaticFragmentsViewPagerAdapter
 import cz.muni.fi.rpg.viewModels.AuthenticationViewModel
 import kotlinx.android.synthetic.main.fragment_character_creation.*
@@ -22,10 +21,11 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.viewmodel.ext.android.sharedViewModel
 import timber.log.Timber
+import java.util.*
 
 class CharacterCreationFragment(
     private val characters: CharacterRepository
-) : BaseFragment(R.layout.fragment_character_creation),
+) : PartyScopedFragment(R.layout.fragment_character_creation),
     CoroutineScope by CoroutineScope(Dispatchers.Default) {
 
     private val args: CharacterCreationFragmentArgs by navArgs()
@@ -131,6 +131,8 @@ class CharacterCreationFragment(
         }
     }
 
+    override fun getPartyId(): UUID = args.partyId
+
     private fun currentStep(): Fragment? {
         return childFragmentManager.findFragmentByTag("f$currentFragmentIndex")
     }

app/src/main/java/cz/muni/fi/rpg/ui/common/PartyScopedFragment.kt

@@ -0,0 +1,46 @@
+package cz.muni.fi.rpg.ui.common
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.annotation.LayoutRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.observe
+import androidx.navigation.fragment.findNavController
+import arrow.core.Either
+import cz.muni.fi.rpg.R
+import cz.muni.fi.rpg.model.domain.party.Party
+import cz.muni.fi.rpg.model.domain.party.PartyNotFound
+import cz.muni.fi.rpg.model.right
+import cz.muni.fi.rpg.viewModels.PartyViewModel
+import org.koin.android.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
+import timber.log.Timber
+import java.util.*
+
+abstract class PartyScopedFragment(@LayoutRes contentLayoutId: Int) :
+    BaseFragment(contentLayoutId) {
+
+    private val viewModel: PartyViewModel by viewModel { parametersOf(getPartyId()) }
+
+    protected val party: LiveData<Party> by lazy { viewModel.party.right() }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        viewModel.party.observe(viewLifecycleOwner) {
+            if (!isAvailable(it)) {
+                Timber.d("Party does not exist or is archived: $it")
+                Toast.makeText(requireContext(), R.string.error_party_not_found, Toast.LENGTH_LONG)
+                    .show()
+                findNavController().popBackStack(R.id.nav_party_list, false)
+            }
+        }
+    }
+
+    protected abstract fun getPartyId(): UUID
+
+    private fun isAvailable(partyOrError: Either<PartyNotFound, Party>): Boolean {
+        return partyOrError.fold({ false }, { !it.isArchived() })
+    }
+}

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

@@ -9,37 +9,33 @@ import androidx.lifecycle.observe
 import androidx.navigation.fragment.navArgs
 import com.google.android.material.tabs.TabLayoutMediator
 import cz.muni.fi.rpg.R
-import cz.muni.fi.rpg.model.right
 import cz.muni.fi.rpg.ui.common.AdManager
-import cz.muni.fi.rpg.ui.common.BaseFragment
+import cz.muni.fi.rpg.ui.common.PartyScopedFragment
 import cz.muni.fi.rpg.ui.common.StaticFragmentsViewPagerAdapter
 import cz.muni.fi.rpg.ui.gameMaster.encounters.EncountersFragment
-import cz.muni.fi.rpg.viewModels.GameMasterViewModel
-import kotlinx.android.synthetic.main.fragment_character.*
 import kotlinx.android.synthetic.main.fragment_character.pager
 import kotlinx.android.synthetic.main.fragment_character.tabLayout
 import kotlinx.android.synthetic.main.fragment_game_master.*
 import kotlinx.android.synthetic.main.fragment_game_master.mainView
 import kotlinx.android.synthetic.main.fragment_game_master.progress
-import org.koin.core.parameter.parametersOf
-import org.koin.android.viewmodel.ext.android.viewModel
 import timber.log.Timber
+import java.util.*
 
 class GameMasterFragment(
     private val adManager: AdManager
-) : BaseFragment(R.layout.fragment_game_master) {
+) : PartyScopedFragment(R.layout.fragment_game_master) {
 
     private val args: GameMasterFragmentArgs by navArgs()
 
-    private val viewModel: GameMasterViewModel by viewModel { parametersOf(args.partyId) }
-
     private lateinit var partyName: String
 
+    override fun getPartyId(): UUID = args.partyId
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         Timber.d("Created view for GameMasterFragment (partyId = ${args.partyId}")
 
-        viewModel.party.right().observe(viewLifecycleOwner) { party ->
+        party.observe(viewLifecycleOwner) { party ->
             mainView.visibility = View.VISIBLE
             progress.visibility = View.GONE
             setTitle(party.getName())

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

@@ -14,7 +14,7 @@ import cz.muni.fi.rpg.model.domain.character.Stats
 import cz.muni.fi.rpg.model.domain.encounter.Combatant
 import cz.muni.fi.rpg.model.domain.encounter.CombatantNotFound
 import cz.muni.fi.rpg.model.domain.encounter.Wounds
-import cz.muni.fi.rpg.ui.common.BaseFragment
+import cz.muni.fi.rpg.ui.common.PartyScopedFragment
 import cz.muni.fi.rpg.ui.common.forms.Form
 import cz.muni.fi.rpg.ui.common.toggleVisibility
 import cz.muni.fi.rpg.viewModels.EncounterDetailViewModel
@@ -25,8 +25,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
+import java.util.*
 
-class CombatantFragment : BaseFragment(R.layout.fragment_combatant),
+class CombatantFragment : PartyScopedFragment(R.layout.fragment_combatant),
     CoroutineScope by CoroutineScope(Dispatchers.Default) {
 
     private val args: CombatantFragmentArgs by navArgs()
@@ -35,6 +36,8 @@ class CombatantFragment : BaseFragment(R.layout.fragment_combatant),
 
     private lateinit var form: Form
 
+    override fun getPartyId(): UUID = args.encounterId.partyId
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)