Merge branch 'feat/show-user-count' into 'master'

fmasa · fmasa · commit a856ac5a40d1 · 2020-06-21T14:39:57.000Z
Zobrazení počtu hráčů

See merge request fmasa/pv239-project!66
diff --git a/app/src/main/java/cz/muni/fi/rpg/di/container.kt b/app/src/main/java/cz/muni/fi/rpg/di/container.kt
@@ -135,10 +135,10 @@ val appModule = module {
     /**
      * ViewModels
      */
-    viewModel { (partyId: UUID) -> PartyViewModel(get(), partyId) }
     viewModel { (characterId: CharacterId) -> CharacterStatsViewModel(characterId, get()) }
     viewModel { (characterId: CharacterId) -> CharacterMiscViewModel(characterId, get(), get()) }
-    viewModel { (characterId: CharacterId) -> CharacterViewModel(characterId, get())}
+    viewModel { (characterId: CharacterId) -> CharacterViewModel(characterId, get(), get())}
+    viewModel { (partyId: UUID) -> GameMasterViewModel(partyId, get(), get()) }
     viewModel { (characterId: CharacterId) -> InventoryViewModel(characterId, get(), get()) }
     viewModel { (characterId: CharacterId) -> SkillsViewModel(characterId, get()) }
     viewModel { (characterId: CharacterId) -> SpellsViewModel(characterId, get()) }
@@ -149,7 +149,7 @@ val appModule = module {
      * Fragments
      */
     fragment { CharacterFragment(get()) }
-    fragment { GameMasterFragment(get(), get()) }
+    fragment { GameMasterFragment(get()) }
     fragment { NavHostFragment() }
     fragment { PartyListFragment(get()) }
     fragment { CharacterEditFragment(get()) }
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
@@ -36,6 +36,8 @@ data class Party(
         require(name.length <= NAME_MAX_LENGTH) {"Party name is too long"}
     }
 
+    fun getPlayerCounts(): Int = users.size - 1
+
     fun isSinglePlayer() = gameMasterId == null
 
     fun updateAmbitions(ambitions: Ambitions) {
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
@@ -17,7 +17,6 @@ import cz.muni.fi.rpg.ui.common.AdManager
 import cz.muni.fi.rpg.ui.common.BaseFragment
 import cz.muni.fi.rpg.ui.common.StaticFragmentsViewPagerAdapter
 import cz.muni.fi.rpg.viewModels.CharacterViewModel
-import cz.muni.fi.rpg.viewModels.PartyViewModel
 import kotlinx.android.synthetic.main.fragment_character.*
 import org.koin.android.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -27,10 +26,9 @@ import timber.log.Timber
 class CharacterFragment(
     private val adManager: AdManager
 ) : BaseFragment(R.layout.fragment_character) {
-    private val args: CharacterFragmentArgs by navArgs()
 
+    private val args: CharacterFragmentArgs by navArgs()
     private val viewModel: CharacterViewModel by viewModel { parametersOf(args.characterId) }
-    private val partyVm: PartyViewModel by viewModel { parametersOf(args.characterId.partyId) }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -47,7 +45,7 @@ class CharacterFragment(
             }
         }
 
-        partyVm.party.right()
+        viewModel.party.right()
             .observe(viewLifecycleOwner) { setSubtitle(it.name) }
 
         pager.adapter = StaticFragmentsViewPagerAdapter(
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
@@ -9,27 +9,24 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.fasterxml.jackson.databind.json.JsonMapper
 import cz.muni.fi.rpg.R
 import cz.muni.fi.rpg.model.domain.character.CharacterId
-import cz.muni.fi.rpg.model.domain.character.CharacterRepository
 import cz.muni.fi.rpg.model.domain.party.Invitation
 import cz.muni.fi.rpg.model.right
 import cz.muni.fi.rpg.ui.common.BaseFragment
 import cz.muni.fi.rpg.ui.common.ChangeAmbitionsDialog
 import cz.muni.fi.rpg.ui.gameMaster.adapter.CharacterAdapter
-import cz.muni.fi.rpg.viewModels.PartyViewModel
+import cz.muni.fi.rpg.viewModels.GameMasterViewModel
 import kotlinx.android.synthetic.main.fragment_game_master.*
 import org.koin.core.parameter.parametersOf
 import org.koin.android.viewmodel.ext.android.viewModel
 import timber.log.Timber
 
 class GameMasterFragment(
-    private val jsonMapper: JsonMapper,
-    private val characterRepository: CharacterRepository
-
+    private val jsonMapper: JsonMapper
 ) : BaseFragment(R.layout.fragment_game_master) {
 
     private val args: GameMasterFragmentArgs by navArgs()
 
-    private val partyViewModel: PartyViewModel by viewModel { parametersOf(args.partyId) }
+    private val viewModel: GameMasterViewModel by viewModel { parametersOf(args.partyId) }
 
     private lateinit var invitation: Invitation
 
@@ -48,7 +45,7 @@ class GameMasterFragment(
         Timber.d("Created view for GameMasterFragment (partyId = ${args.partyId}")
 
 
-        partyViewModel.party.right().observe(viewLifecycleOwner) { party ->
+        viewModel.party.right().observe(viewLifecycleOwner) { party ->
             setTitle(party.name)
             invitation = party.getInvitation()
 
@@ -59,15 +56,15 @@ class GameMasterFragment(
                 ChangeAmbitionsDialog
                     .newInstance(getString(R.string.title_party_ambitions), party.getAmbitions())
                     .setOnSaveListener {
-                        partyViewModel.updatePartyAmbitions(it)
+                        viewModel.updatePartyAmbitions(it)
                     }.show(childFragmentManager, "ChangeAmbitionsDialog")
             }
         }
 
         inviteButton.setOnClickListener { showQrCode() }
 
-        characterRepository.inParty(args.partyId).observe(viewLifecycleOwner) { characters ->
-            if (characters.isNotEmpty()) {
+        viewModel.getPlayers().observe(viewLifecycleOwner) { players ->
+            if (players.isNotEmpty()) {
                 val adapter = CharacterAdapter(layoutInflater)
                 {
                     findNavController()
@@ -79,7 +76,7 @@ class GameMasterFragment(
                 characterListRecycler.adapter = adapter
                 characterListRecycler.layoutManager = LinearLayoutManager(context)
 
-                adapter.submitList(characters)
+                adapter.submitList(players)
 
                 setEmptyCollectionView(false)
             } else {
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/adapter/CharacterAdapter.kt b/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/adapter/CharacterAdapter.kt
@@ -4,20 +4,34 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
+import arrow.core.Either
 import cz.muni.fi.rpg.R
 import cz.muni.fi.rpg.common.EntityListener
 import cz.muni.fi.rpg.model.domain.character.Character
 
+typealias Player = Either<PlayerWithoutCharacter, Character>
+
 class CharacterAdapter(
     private val layoutInflater: LayoutInflater,
     private val onClickListener: EntityListener<Character>
-) : ListAdapter<Character, CharacterHolder>(
-    object:  DiffUtil.ItemCallback<Character>() {
-        override fun areItemsTheSame(oldItem: Character, newItem: Character): Boolean =
-            oldItem.userId == newItem.userId
+) : ListAdapter<Player, CharacterHolder>(
+    object : DiffUtil.ItemCallback<Player>() {
+        override fun areItemsTheSame(oldItem: Player, newItem: Player): Boolean {
+            return extractUserId(oldItem) == extractUserId(newItem)
+        }
+
+        override fun areContentsTheSame(oldItem: Player, newItem: Player): Boolean {
+            return oldItem.isLeft() == newItem.isLeft() &&
+                    comparableHash(oldItem) == comparableHash(newItem)
+        }
+
+        private fun extractUserId(player: Player): String {
+            return player.fold({ it.userId }, { it.userId })
+        }
 
-        override fun areContentsTheSame(oldItem: Character, newItem: Character): Boolean =
-            oldItem == newItem
+        private fun comparableHash(player: Player): Int {
+           return player.fold({ it.hashCode() }, { it.hashCode() })
+        }
     }
 ) {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CharacterHolder {
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/adapter/CharacterHolder.kt b/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/adapter/CharacterHolder.kt
@@ -10,10 +10,24 @@ class CharacterHolder(
     itemView: View,
     private val onClickListener: EntityListener<Character>
 ) : RecyclerView.ViewHolder(itemView) {
-    fun bind(item: Character) {
-        itemView.character_name.text = item.getName()
-        itemView.character_race.setText(item.getRace().getReadableNameId())
-        itemView.character_job.text = item.getCareer()
-        itemView.setOnClickListener { onClickListener(item) }
+    fun bind(item: Player) {
+        item.mapLeft {
+            listOf(itemView.character_name, itemView.character_job, itemView.character_race)
+                .forEach { it.visibility = View.GONE }
+
+            itemView.waitingForCharacter.visibility = View.VISIBLE
+            itemView.setOnClickListener {  }
+            itemView.isClickable = false
+            itemView.isFocusable = false
+        }
+
+        item.map {character ->
+            itemView.character_name.text = character.getName()
+            itemView.character_race.setText(character.getRace().getReadableNameId())
+            itemView.character_job.text = character.getCareer()
+            itemView.setOnClickListener { onClickListener(character) }
+            itemView.isClickable = true
+            itemView.isFocusable = true
+        }
     }
 }
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/adapter/PlayerWithoutCharacter.kt b/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/adapter/PlayerWithoutCharacter.kt
@@ -0,0 +1,3 @@
+package cz.muni.fi.rpg.ui.gameMaster.adapter
+
+data class PlayerWithoutCharacter(val userId: String)
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
@@ -13,6 +13,14 @@ class PartyHolder(
     fun bind(item: Party) {
         view.party_item_title.text = item.name
 
+        val playersCount = item.getPlayerCounts()
+
+        if (playersCount > 0) {
+            view.playersCount.text = playersCount.toString()
+            view.playersCount.visibility = View.VISIBLE
+            view.playersCountIcon.visibility = View.VISIBLE
+        }
+
         view.setOnClickListener { onClickListener(item) }
     }
 }
diff --git a/app/src/main/java/cz/muni/fi/rpg/viewModels/CharacterViewModel.kt b/app/src/main/java/cz/muni/fi/rpg/viewModels/CharacterViewModel.kt
@@ -1,14 +1,22 @@
 package cz.muni.fi.rpg.viewModels
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
+import arrow.core.Either
 import cz.muni.fi.rpg.model.domain.character.CharacterId
 import cz.muni.fi.rpg.model.domain.character.CharacterRepository
+import cz.muni.fi.rpg.model.domain.party.Party
+import cz.muni.fi.rpg.model.domain.party.PartyNotFound
+import cz.muni.fi.rpg.model.domain.party.PartyRepository
 import kotlinx.coroutines.*
 
 class CharacterViewModel(
-    val characterId: CharacterId,
-    characters: CharacterRepository
+    characterId: CharacterId,
+    characters: CharacterRepository,
+    parties: PartyRepository
 ) : ViewModel(), CoroutineScope by CoroutineScope(Dispatchers.Default) {
 
     val character = characters.getLive(characterId)
+
+    val party: LiveData<Either<PartyNotFound, Party>> = parties.getLive(characterId.partyId)
 }
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
@@ -0,0 +1,62 @@
+package cz.muni.fi.rpg.viewModels
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.Transformations
+import androidx.lifecycle.ViewModel
+import arrow.core.Either
+import arrow.core.Left
+import arrow.core.Right
+import cz.muni.fi.rpg.model.domain.character.Character
+import cz.muni.fi.rpg.model.domain.character.CharacterRepository
+import cz.muni.fi.rpg.model.domain.common.Ambitions
+import cz.muni.fi.rpg.model.domain.party.Party
+import cz.muni.fi.rpg.model.domain.party.PartyNotFound
+import cz.muni.fi.rpg.model.domain.party.PartyRepository
+import cz.muni.fi.rpg.model.right
+import cz.muni.fi.rpg.ui.common.CombinedLiveData
+import cz.muni.fi.rpg.ui.gameMaster.adapter.Player
+import cz.muni.fi.rpg.ui.gameMaster.adapter.PlayerWithoutCharacter
+import java.util.*
+
+class GameMasterViewModel(
+    private val partyId: UUID,
+    private val parties: PartyRepository,
+    characterRepository: CharacterRepository
+) : ViewModel() {
+
+    val party: LiveData<Either<PartyNotFound, Party>> = parties.getLive(partyId)
+    val characters: LiveData<List<Character>> = characterRepository.inParty(partyId)
+
+    /**
+     * Returns LiveData with either CharacterId of players current character or NULL if user
+     * didn't create character yet
+     */
+    fun getPlayers(): LiveData<List<Player>> {
+        return Transformations.map(
+            CombinedLiveData(party.right(), characters)
+        ) { partyAndCharacters ->
+            val party = partyAndCharacters.first
+            val characters = partyAndCharacters.second
+                .map { character -> character.userId to character }
+                .toMap()
+
+            party.users
+                .filter { it != party.gameMasterId }
+                .map {
+                    val character = characters[it]
+
+                    if (character == null)
+                        Left(PlayerWithoutCharacter(it))
+                    else Right(character)
+                }
+        }
+    }
+
+    suspend fun updatePartyAmbitions(ambitions: Ambitions) {
+        val party = parties.get(partyId)
+
+        party.updateAmbitions(ambitions)
+
+        parties.save(party)
+    }
+}
diff --git a/app/src/main/java/cz/muni/fi/rpg/viewModels/PartyViewModel.kt b/app/src/main/java/cz/muni/fi/rpg/viewModels/PartyViewModel.kt
diff --git a/app/src/main/res/layout/character_item.xml b/app/src/main/res/layout/character_item.xml
@@ -12,6 +12,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
+        android:id="@+id/characterItemLayout"
         android:layout_height="match_parent"
         android:layout_marginHorizontal="20dp"
         android:layout_marginVertical="16dp">
@@ -42,6 +43,22 @@
             app:layout_constraintLeft_toRightOf="@id/character_icon"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <TextView
+            android:id="@+id/waitingForCharacter"
+            android:visibility="gone"
+            android:text="@string/waiting_for_character"
+            app:layout_constraintTop_toTopOf="@id/character_icon"
+            app:layout_constraintBottom_toBottomOf="@id/character_icon"
+            android:layout_marginStart="16dp"
+            app:layout_constraintStart_toEndOf="@id/character_icon"
+            app:layout_constraintEnd_toEndOf="parent"
+            style="Text"
+            android:textStyle="italic"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"/>
+
         <TextView
             android:id="@+id/character_race"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/party_item.xml b/app/src/main/res/layout/party_item.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ data class Party(`
`36`	`36`	`require(name.length <= NAME_MAX_LENGTH) {"Party name is too long"}`
`37`	`37`	`}`
`38`	`38`
	`39`	`+ fun getPlayerCounts(): Int = users.size - 1`
	`40`	`+`
`39`	`41`	`fun isSinglePlayer() = gameMasterId == null`
`40`	`42`
`41`	`43`	`fun updateAmbitions(ambitions: Ambitions) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package cz.muni.fi.rpg.ui.gameMaster.adapter`
	`2`	`+`
	`3`	`+data class PlayerWithoutCharacter(val userId: String)`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,14 @@ class PartyHolder(`
`13`	`13`	`fun bind(item: Party) {`
`14`	`14`	`view.party_item_title.text = item.name`
`15`	`15`
	`16`	`+ val playersCount = item.getPlayerCounts()`
	`17`	`+`
	`18`	`+ if (playersCount > 0) {`
	`19`	`+ view.playersCount.text = playersCount.toString()`
	`20`	`+ view.playersCount.visibility = View.VISIBLE`
	`21`	`+ view.playersCountIcon.visibility = View.VISIBLE`
	`22`	`+ }`
	`23`	`+`
`16`	`24`	`view.setOnClickListener { onClickListener(item) }`
`17`	`25`	`}`
`18`	`26`	`}`