HomeDetailFragment observe the selectedGroupStore instead of passing argument

vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt

@@ -17,18 +17,17 @@
 package im.vector.riotx.features.home
 
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.LayoutInflater
 import androidx.core.view.forEachIndexed
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
-import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.bottomnavigation.BottomNavigationItemView
 import com.google.android.material.bottomnavigation.BottomNavigationMenuView
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
+import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenComponent
 import im.vector.riotx.core.platform.ToolbarConfigurable
@@ -38,26 +37,16 @@ import im.vector.riotx.features.home.room.list.RoomListFragment
 import im.vector.riotx.features.home.room.list.RoomListParams
 import im.vector.riotx.features.home.room.list.UnreadCounterBadgeView
 import im.vector.riotx.features.workers.signout.SignOutViewModel
-import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_home_detail.*
 import javax.inject.Inject
 
 
-@Parcelize
-data class HomeDetailParams(
-        val groupId: String,
-        val groupName: String,
-        val groupAvatar: String
-) : Parcelable
-
-
 private const val INDEX_CATCHUP = 0
 private const val INDEX_PEOPLE = 1
 private const val INDEX_ROOMS = 2
 
 class HomeDetailFragment : VectorBaseFragment(), KeysBackupBanner.Delegate {
 
-    private val params: HomeDetailParams by args()
     private val unreadCounterBadgeViews = arrayListOf<UnreadCounterBadgeView>()
 
     private val viewModel: HomeDetailViewModel by fragmentViewModel()
@@ -84,11 +73,25 @@ class HomeDetailFragment : VectorBaseFragment(), KeysBackupBanner.Delegate {
         setupToolbar()
         setupKeysBackupBanner()
 
+        viewModel.selectSubscribe(this, HomeDetailViewState::groupSummary) { groupSummary ->
+            onGroupChange(groupSummary.orNull())
+        }
         viewModel.selectSubscribe(this, HomeDetailViewState::displayMode) { displayMode ->
             switchDisplayMode(displayMode)
         }
     }
 
+    private fun onGroupChange(groupSummary: GroupSummary?) {
+        groupSummary?.let {
+            avatarRenderer.render(
+                    it.avatarUrl,
+                    it.groupId,
+                    it.displayName,
+                    groupToolbarAvatarImageView
+            )
+        }
+    }
+
     private fun setupKeysBackupBanner() {
         // Keys backup banner
         // Use the SignOutViewModel, it observe the keys backup state and this is what we need here
@@ -130,12 +133,6 @@ class HomeDetailFragment : VectorBaseFragment(), KeysBackupBanner.Delegate {
             parentActivity.configure(groupToolbar)
         }
         groupToolbar.title = ""
-        avatarRenderer.render(
-                params.groupAvatar,
-                params.groupId,
-                params.groupName,
-                groupToolbarAvatarImageView
-        )
         groupToolbarAvatarImageView.setOnClickListener {
             navigationViewModel.goTo(HomeActivity.Navigation.OpenDrawer)
         }
@@ -207,10 +204,8 @@ class HomeDetailFragment : VectorBaseFragment(), KeysBackupBanner.Delegate {
 
     companion object {
 
-        fun newInstance(args: HomeDetailParams): HomeDetailFragment {
-            return HomeDetailFragment().apply {
-                setArguments(args)
-            }
+        fun newInstance(): HomeDetailFragment {
+            return HomeDetailFragment()
         }
 
     }

vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt

@@ -25,6 +25,7 @@ import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.rx.rx
 import im.vector.riotx.core.di.HasScreenInjector
 import im.vector.riotx.core.platform.VectorViewModel
+import im.vector.riotx.features.home.group.SelectedGroupStore
 import im.vector.riotx.features.home.room.list.RoomListFragment
 import im.vector.riotx.features.ui.UiStateRepository
 import io.reactivex.schedulers.Schedulers
@@ -36,6 +37,7 @@ import io.reactivex.schedulers.Schedulers
 class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: HomeDetailViewState,
                                                       private val session: Session,
                                                       private val uiStateRepository: UiStateRepository,
+                                                      private val selectedGroupStore: SelectedGroupStore,
                                                       private val homeRoomListStore: HomeRoomListObservableStore)
     : VectorViewModel<HomeDetailViewState>(initialState) {
 
@@ -62,6 +64,7 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
 
     init {
         observeSyncState()
+        observeSelectedGroupStore()
         observeRoomSummaries()
     }
 
@@ -88,6 +91,17 @@ class HomeDetailViewModel @AssistedInject constructor(@Assisted initialState: Ho
                 .disposeOnClear()
     }
 
+    private fun observeSelectedGroupStore() {
+        selectedGroupStore
+                .observe()
+                .subscribe {
+                    setState {
+                        copy(groupSummary = it)
+                    }
+                }
+                .disposeOnClear()
+    }
+
     private fun observeRoomSummaries() {
         homeRoomListStore
                 .observe()

vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewState.kt

@@ -16,11 +16,14 @@
 
 package im.vector.riotx.features.home
 
+import arrow.core.Option
 import com.airbnb.mvrx.MvRxState
+import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.matrix.android.api.session.sync.SyncState
 import im.vector.riotx.features.home.room.list.RoomListFragment
 
 data class HomeDetailViewState(
+        val groupSummary: Option<GroupSummary> = Option.empty(),
         val displayMode: RoomListFragment.DisplayMode = RoomListFragment.DisplayMode.HOME,
         val notificationCountCatchup: Int = 0,
         val notificationHighlightCatchup: Boolean = false,

vector/src/main/java/im/vector/riotx/features/home/HomeNavigator.kt

@@ -36,8 +36,7 @@ class HomeNavigator @Inject constructor() {
         activity?.let {
             it.drawerLayout?.closeDrawer(GravityCompat.START)
 
-            val args = HomeDetailParams(groupSummary.groupId, groupSummary.displayName, groupSummary.avatarUrl)
-            val homeDetailFragment = HomeDetailFragment.newInstance(args)
+            val homeDetailFragment = HomeDetailFragment.newInstance()
             it.replaceFragment(homeDetailFragment, R.id.homeDetailFragmentContainer)
         }
     }

vector/src/main/java/im/vector/riotx/features/home/group/GroupListViewModel.kt

@@ -39,7 +39,7 @@ import io.reactivex.functions.BiFunction
 const val ALL_COMMUNITIES_GROUP_ID = "ALL_COMMUNITIES_GROUP_ID"
 
 class GroupListViewModel @AssistedInject constructor(@Assisted initialState: GroupListViewState,
-                                                     private val selectedGroupHolder: SelectedGroupStore,
+                                                     private val selectedGroupStore: SelectedGroupStore,
                                                      private val session: Session,
                                                      private val stringProvider: StringProvider
 ) : VectorViewModel<GroupListViewState>(initialState) {
@@ -73,7 +73,7 @@ class GroupListViewModel @AssistedInject constructor(@Assisted initialState: Gro
             if (it != null) {
                 _openGroupLiveData.postLiveEvent(it)
                 val optionGroup = Option.fromNullable(it)
-                selectedGroupHolder.post(optionGroup)
+                selectedGroupStore.post(optionGroup)
             }
         }
     }