From aec7e72dcf8ab233d6d928bd44589cddbbe2a55c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 Jun 2019 09:44:24 +0200
Subject: [PATCH 01/15] Add missing files for Status theme

---
 vector/src/main/res/values-v21/theme_status.xml |  7 ++++++-
 vector/src/main/res/values-v23/theme_status.xml | 10 ++++++++++
 vector/src/main/res/values-v27/theme_status.xml | 10 ++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 vector/src/main/res/values-v23/theme_status.xml
 create mode 100644 vector/src/main/res/values-v27/theme_status.xml

diff --git a/vector/src/main/res/values-v21/theme_status.xml b/vector/src/main/res/values-v21/theme_status.xml
index dfa41ebd..3deb65a9 100644
--- a/vector/src/main/res/values-v21/theme_status.xml
+++ b/vector/src/main/res/values-v21/theme_status.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme.Status" parent="AppTheme.Base.Status">
+    <style name="AppTheme.Status.v21" parent="AppTheme.Base.Status">
+        <item name="android:statusBarColor">@color/riotx_header_panel_background_light</item>
+        <item name="android:navigationBarColor">@color/riotx_header_panel_background_light</item>
+
         <!-- enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
     </style>
 
+    <style name="AppTheme.Status" parent="AppTheme.Status.v21" />
+
 </resources>
diff --git a/vector/src/main/res/values-v23/theme_status.xml b/vector/src/main/res/values-v23/theme_status.xml
new file mode 100644
index 00000000..054e9fcb
--- /dev/null
+++ b/vector/src/main/res/values-v23/theme_status.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.Status.v23" parent="AppTheme.Status.v21">
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+
+    <style name="AppTheme.Status" parent="AppTheme.Status.v23"/>
+
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-v27/theme_status.xml b/vector/src/main/res/values-v27/theme_status.xml
new file mode 100644
index 00000000..3c72ede3
--- /dev/null
+++ b/vector/src/main/res/values-v27/theme_status.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.Status.v27" parent="AppTheme.Status.v23">
+        <item name="android:windowLightNavigationBar">true</item>
+    </style>
+
+    <style name="AppTheme.Status" parent="AppTheme.Status.v27" />
+
+</resources>
\ No newline at end of file

From ed18a504e40c017054829496340aa1e15f5b660e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 Jun 2019 10:47:28 +0200
Subject: [PATCH 02/15] Open drawer when clicking on group avatar

---
 .../im/vector/riotredesign/features/home/HomeActivity.kt | 9 +++++----
 .../riotredesign/features/home/HomeDetailFragment.kt     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
index 538666e5..9ec42de8 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
@@ -113,10 +113,6 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            android.R.id.home          -> {
-                drawerLayout.openDrawer(GravityCompat.START)
-                return true
-            }
             R.id.sliding_menu_sign_out -> {
                 SignOutUiWorker(this).perform(Matrix.getInstance().currentSession!!)
                 return true
@@ -126,6 +122,11 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
         return true
     }
 
+    // Called by HomeDetailFragment
+    fun openDrawer() {
+        drawerLayout.openDrawer(GravityCompat.START)
+    }
+
     override fun onBackPressed() {
         if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
             drawerLayout.closeDrawer(GravityCompat.START)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt
index ef6543b1..25c38c23 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt
@@ -89,7 +89,7 @@ class HomeDetailFragment : VectorBaseFragment() {
                 groupToolbarAvatarImageView
         )
         groupToolbarAvatarImageView.setOnClickListener {
-            vectorBaseActivity.notImplemented("Group click in toolbar")
+            (vectorBaseActivity as? HomeActivity)?.openDrawer()
         }
     }
 

From 4c5bffe0f5445bcc271df9fcee77f787c64a7422 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 Jun 2019 16:07:35 +0200
Subject: [PATCH 03/15] Create room screen - WIP TODO: screen rotation -
 navigate to created room

---
 .../room/model/create/CreateRoomParams.kt     |   2 +-
 .../session/room/create/CreateRoomTask.kt     |   1 +
 .../features/form/FormEditTextItem.kt         |  77 ++++++++++++
 .../features/form/FormSwitchItem.kt           |  77 ++++++++++++
 .../roomdirectory/PublicRoomsFragment.kt      |   5 +-
 .../roomdirectory/RoomDirectoryActivity.kt    |   6 +
 .../roomdirectory/RoomDirectoryModule.kt      |  11 +-
 .../createroom/CreateRoomController.kt        | 112 ++++++++++++++++++
 .../createroom/CreateRoomFragment.kt          | 104 ++++++++++++++++
 .../createroom/CreateRoomViewModel.kt         |  80 +++++++++++++
 .../createroom/CreateRoomViewState.kt         |  28 +++++
 vector/src/main/res/drawable/ic_x_18dp.xml    |  14 +++
 .../main/res/layout/fragment_create_room.xml  |  71 +++++++++++
 .../src/main/res/layout/item_form_switch.xml  |  62 ++++++++++
 .../main/res/layout/item_form_text_input.xml  |  39 ++++++
 .../main/res/menu/vector_room_creation.xml    |   6 +-
 vector/src/main/res/values/dimens.xml         |   3 +
 vector/src/main/res/values/strings_riotX.xml  |   9 ++
 18 files changed, 698 insertions(+), 9 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
 create mode 100644 vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt
 create mode 100644 vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt
 create mode 100644 vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
 create mode 100644 vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt
 create mode 100644 vector/src/main/res/drawable/ic_x_18dp.xml
 create mode 100644 vector/src/main/res/layout/fragment_create_room.xml
 create mode 100644 vector/src/main/res/layout/item_form_switch.xml
 create mode 100644 vector/src/main/res/layout/item_form_text_input.xml

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt
index 8347d0af..5f732d2b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/create/CreateRoomParams.kt
@@ -100,7 +100,7 @@ class CreateRoomParams {
      * private_chat => join_rules is set to invite. history_visibility is set to shared.
      * trusted_private_chat => join_rules is set to invite. history_visibility is set to shared. All invitees are given the same power level as the
      * room creator.
-     * public_chat: => join_rules is set to public. history_visibility is set to shared. One of: ["private_chat", "public_chat", "trusted_private_chat"]
+     * public_chat: => join_rules is set to public. history_visibility is set to shared.
      */
     var preset: CreateRoomPreset? = null
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
index b3aa137a..45c3c8b1 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
@@ -54,6 +54,7 @@ internal class DefaultCreateRoomTask(private val roomAPI: RoomAPI,
             handlerThread.start()
             val handler = Handler(handlerThread.looper)
 
+            // TODO Maybe do the same code for join room request ?
             handler.post {
                 val realm = Realm.getInstance(realmConfiguration)
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
new file mode 100644
index 00000000..2d60a9c0
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.form
+
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import im.vector.riotredesign.R
+import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
+import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
+import im.vector.riotredesign.core.platform.SimpleTextWatcher
+
+@EpoxyModelClass(layout = R.layout.item_form_text_input)
+abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
+
+    @EpoxyAttribute
+    var hint: String? = null
+
+    @EpoxyAttribute
+    var value: String? = null
+
+    @EpoxyAttribute
+    var enabled: Boolean = true
+
+    @EpoxyAttribute
+    var onTextChange: ((String) -> Unit)? = null
+
+
+    override fun bind(holder: Holder) {
+        holder.textInputLayout.isEnabled = enabled
+        holder.textInputLayout.hint = hint
+
+        // Update only if text is different
+        if (holder.textInputEditText.text.toString() != value) {
+            holder.textInputEditText.setText(value)
+        }
+        holder.textInputEditText.isEnabled = enabled
+
+        holder.textInputEditText.addTextChangedListener(object : SimpleTextWatcher() {
+            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                onTextChange?.invoke(s.toString())
+            }
+        })
+    }
+
+    override fun shouldSaveViewState(): Boolean {
+        return true
+    }
+
+    override fun unbind(holder: Holder) {
+        super.unbind(holder)
+
+        // TODO Remove onTextChanged?
+
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val textInputLayout by bind<TextInputLayout>(R.id.formTextInputTextInputLayout)
+        val textInputEditText by bind<TextInputEditText>(R.id.formTextInputTextInputEditText)
+    }
+}
+
diff --git a/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt
new file mode 100644
index 00000000..96bb2e07
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.form
+
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import com.google.android.material.switchmaterial.SwitchMaterial
+import im.vector.riotredesign.R
+import im.vector.riotredesign.core.epoxy.VectorEpoxyHolder
+import im.vector.riotredesign.core.epoxy.VectorEpoxyModel
+import im.vector.riotredesign.core.extensions.setTextOrHide
+
+@EpoxyModelClass(layout = R.layout.item_form_switch)
+abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
+
+    @EpoxyAttribute
+    var listener: ((Boolean) -> Unit)? = null
+
+    @EpoxyAttribute
+    var enabled: Boolean = true
+
+    @EpoxyAttribute
+    var switchChecked: Boolean = false
+
+    @EpoxyAttribute
+    var title: String? = null
+
+    @EpoxyAttribute
+    var summary: String? = null
+
+    override fun bind(holder: Holder) {
+        holder.titleView.text = title
+        holder.summaryView.setTextOrHide(summary)
+
+        holder.switchView.isEnabled = enabled
+
+        holder.switchView.isChecked = switchChecked
+
+        holder.switchView.setOnCheckedChangeListener { _, isChecked ->
+            listener?.invoke(isChecked)
+        }
+    }
+
+    override fun shouldSaveViewState(): Boolean {
+        return true
+    }
+
+    override fun unbind(holder: Holder) {
+        super.unbind(holder)
+
+        holder.switchView.setOnCheckedChangeListener(null)
+    }
+
+
+    class Holder : VectorEpoxyHolder() {
+        val titleView by bind<TextView>(R.id.formSwitchTitle)
+        val summaryView by bind<TextView>(R.id.formSwitchSummary)
+        val switchView by bind<SwitchMaterial>(R.id.formSwitchSwitch)
+    }
+
+}
+
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
index 5deab028..7b8e88ff 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
@@ -76,9 +76,8 @@ class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback
                 .disposeOnDestroy()
 
         publicRoomsCreateNewRoom.setOnClickListener {
-            // TODO homeActivityViewModel.createRoom()
-
-            vectorBaseActivity.notImplemented()
+            // TODO Not the best navigation pattern
+            (vectorBaseActivity as? RoomDirectoryActivity)?.gotoCreateRoom()
         }
 
         viewModel.joinRoomErrorLiveData.observe(this, Observer {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
index c0ac91ee..63907621 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
@@ -19,7 +19,9 @@ package im.vector.riotredesign.features.roomdirectory
 import android.os.Bundle
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.extensions.addFragment
+import im.vector.riotredesign.core.extensions.addFragmentToBackstack
 import im.vector.riotredesign.core.platform.VectorBaseActivity
+import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomFragment
 import org.koin.android.scope.ext.android.bindScope
 import org.koin.android.scope.ext.android.getOrCreateScope
 
@@ -40,4 +42,8 @@ class RoomDirectoryActivity : VectorBaseActivity() {
         }
     }
 
+
+    fun gotoCreateRoom() {
+        addFragmentToBackstack(CreateRoomFragment(), R.id.simpleFragmentContainer)
+    }
 }
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryModule.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryModule.kt
index 6dcdb932..2ac22864 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryModule.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryModule.kt
@@ -17,11 +17,11 @@
 package im.vector.riotredesign.features.roomdirectory
 
 import im.vector.matrix.android.api.session.Session
+import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomController
 import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryListCreator
 import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerController
 import org.koin.dsl.module.module
 
-// TODO Ganfra: When do we create a new module?
 class RoomDirectoryModule {
 
     companion object {
@@ -41,5 +41,14 @@ class RoomDirectoryModule {
         scope(ROOM_DIRECTORY_SCOPE) {
             PublicRoomsController(get(), get())
         }
+
+        /* ==========================================================================================
+         * Create room
+         * ========================================================================================== */
+
+        scope(ROOM_DIRECTORY_SCOPE) {
+            CreateRoomController(get(), get())
+        }
+
     }
 }
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt
new file mode 100644
index 00000000..6d925e08
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomController.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.roomdirectory.createroom
+
+import com.airbnb.epoxy.TypedEpoxyController
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import im.vector.riotredesign.R
+import im.vector.riotredesign.core.epoxy.errorWithRetryItem
+import im.vector.riotredesign.core.epoxy.loadingItem
+import im.vector.riotredesign.core.error.ErrorFormatter
+import im.vector.riotredesign.core.resources.StringProvider
+import im.vector.riotredesign.features.form.formEditTextItem
+import im.vector.riotredesign.features.form.formSwitchItem
+
+class CreateRoomController(private val stringProvider: StringProvider,
+                           private val errorFormatter: ErrorFormatter
+) : TypedEpoxyController<CreateRoomViewState>() {
+
+    var listener: Listener? = null
+
+    var index = 0
+
+    override fun buildModels(viewState: CreateRoomViewState) {
+        val asyncCreateRoom = viewState.asyncCreateRoomRequest
+
+        when (asyncCreateRoom) {
+            is Success       -> {
+                // Nothing to display, the screen will be closed
+            }
+            is Loading       -> {
+                // display the form
+                buildForm(viewState, false)
+                loadingItem {
+                    id("loading")
+                }
+            }
+            is Uninitialized -> {
+                // display the form
+                buildForm(viewState, true)
+            }
+            is Fail          -> {
+                // display the form
+                buildForm(viewState, true)
+                errorWithRetryItem {
+                    id("error")
+                    text(errorFormatter.toHumanReadable(asyncCreateRoom.error))
+                    listener { listener?.retry() }
+                }
+            }
+        }
+    }
+
+    private fun buildForm(viewState: CreateRoomViewState, enableFormElement: Boolean) {
+        formEditTextItem {
+            id("name")
+            enabled(enableFormElement)
+            value(viewState.roomName)
+            hint(stringProvider.getString(R.string.create_room_name_hint))
+
+            onTextChange { text ->
+                listener?.onNameChange(text)
+            }
+        }
+        formSwitchItem {
+            id("public")
+            enabled(enableFormElement)
+            title(stringProvider.getString(R.string.create_room_public_title))
+            summary(stringProvider.getString(R.string.create_room_public_description))
+            switchChecked(viewState.isPublic)
+
+            listener { value ->
+                listener?.setIsPublic(value)
+            }
+        }
+        formSwitchItem {
+            id("directory")
+            enabled(enableFormElement)
+            title(stringProvider.getString(R.string.create_room_directory_title))
+            summary(stringProvider.getString(R.string.create_room_directory_description))
+            switchChecked(viewState.isInRoomDirectory)
+
+            listener { value ->
+                listener?.setIsInRoomDirectory(value)
+            }
+        }
+    }
+
+    interface Listener {
+        fun onNameChange(newName: String)
+        fun setIsPublic(isPublic: Boolean)
+        fun setIsInRoomDirectory(isInRoomDirectory: Boolean)
+        fun retry()
+    }
+
+}
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
new file mode 100644
index 00000000..58630118
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.roomdirectory.createroom
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.riotredesign.R
+import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotredesign.features.roomdirectory.RoomDirectoryModule
+import kotlinx.android.synthetic.main.fragment_create_room.*
+import org.koin.android.ext.android.inject
+import org.koin.android.scope.ext.android.bindScope
+import org.koin.android.scope.ext.android.getOrCreateScope
+import timber.log.Timber
+
+class CreateRoomFragment : VectorBaseFragment(), CreateRoomController.Listener {
+
+    private val viewModel: CreateRoomViewModel by fragmentViewModel()
+    private val createRoomController: CreateRoomController by inject()
+
+    override fun getLayoutResId() = R.layout.fragment_create_room
+
+    override fun getMenuRes() = R.menu.vector_room_creation
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        bindScope(getOrCreateScope(RoomDirectoryModule.ROOM_DIRECTORY_SCOPE))
+
+        vectorBaseActivity.setSupportActionBar(createRoomToolbar)
+
+        setupRecyclerView()
+
+        createRoomClose.setOnClickListener {
+            // TODO Not the best way to manage Fragment Backstack...
+            vectorBaseActivity.onBackPressed()
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.action_create_room -> {
+                viewModel.doCreateRoom()
+                true
+            }
+            else                    ->
+                super.onOptionsItemSelected(item)
+        }
+    }
+
+    private fun setupRecyclerView() {
+        val layoutManager = LinearLayoutManager(context)
+
+        createRoomForm.layoutManager = layoutManager
+        createRoomController.listener = this
+
+        createRoomForm.setController(createRoomController)
+    }
+
+    override fun onNameChange(newName: String) {
+        viewModel.setName(newName)
+    }
+
+    override fun setIsPublic(isPublic: Boolean) {
+        viewModel.setIsPublic(isPublic)
+    }
+
+    override fun setIsInRoomDirectory(isInRoomDirectory: Boolean) {
+        viewModel.setIsInRoomDirectory(isInRoomDirectory)
+    }
+
+    override fun retry() {
+        Timber.v("Retry")
+        viewModel.doCreateRoom()
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        if (state.asyncCreateRoomRequest is Success) {
+            vectorBaseActivity.notImplemented("navigate to freshly created room")
+        } else {
+            // Populate list with Epoxy
+            createRoomController.setData(state)
+        }
+    }
+
+
+}
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt
new file mode 100644
index 00000000..125330db
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.roomdirectory.createroom
+
+import com.airbnb.mvrx.*
+import im.vector.matrix.android.api.MatrixCallback
+import im.vector.matrix.android.api.session.Session
+import im.vector.matrix.android.api.session.room.model.RoomDirectoryVisibility
+import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
+import im.vector.matrix.android.api.session.room.model.create.CreateRoomPreset
+import im.vector.riotredesign.core.platform.VectorViewModel
+import org.koin.android.ext.android.get
+
+class CreateRoomViewModel(initialState: CreateRoomViewState,
+                          private val session: Session) : VectorViewModel<CreateRoomViewState>(initialState) {
+
+    companion object : MvRxViewModelFactory<CreateRoomViewModel, CreateRoomViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: CreateRoomViewState): CreateRoomViewModel? {
+            val currentSession = viewModelContext.activity.get<Session>()
+
+            return CreateRoomViewModel(state, currentSession)
+        }
+    }
+
+    fun setName(newName: String) = setState { copy(roomName = newName) }
+
+    fun setIsPublic(value: Boolean) = setState { copy(isPublic = value) }
+
+    fun setIsInRoomDirectory(isInRoomDirectory: Boolean) = setState { copy(isInRoomDirectory = isInRoomDirectory) }
+
+    fun doCreateRoom() = withState { state ->
+        if (state.asyncCreateRoomRequest is Loading || state.asyncCreateRoomRequest is Success) {
+            return@withState
+        }
+
+        setState {
+            copy(asyncCreateRoomRequest = Loading())
+        }
+
+        val createRoomParams = CreateRoomParams().apply {
+            name = state.roomName.takeIf { it.isNotBlank() }
+
+            // Directory visibility
+            visibility = if (state.isInRoomDirectory) RoomDirectoryVisibility.PUBLIC else RoomDirectoryVisibility.PRIVATE
+
+            preset = if (state.isPublic) CreateRoomPreset.PRESET_PUBLIC_CHAT else CreateRoomPreset.PRESET_PRIVATE_CHAT
+        }
+
+        session.createRoom(createRoomParams, object : MatrixCallback<String> {
+            override fun onSuccess(data: String) {
+                setState {
+                    copy(asyncCreateRoomRequest = Success(data))
+                }
+            }
+
+            override fun onFailure(failure: Throwable) {
+                setState {
+                    copy(asyncCreateRoomRequest = Fail(failure))
+                }
+            }
+        })
+    }
+
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt
new file mode 100644
index 00000000..42d9d144
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewState.kt
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.roomdirectory.createroom
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+
+data class CreateRoomViewState(
+        val roomName: String = "",
+        val isPublic: Boolean = false,
+        val isInRoomDirectory: Boolean = false,
+        val asyncCreateRoomRequest: Async<String> = Uninitialized
+) : MvRxState
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/ic_x_18dp.xml b/vector/src/main/res/drawable/ic_x_18dp.xml
new file mode 100644
index 00000000..3172da8c
--- /dev/null
+++ b/vector/src/main/res/drawable/ic_x_18dp.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M16,2L2,16M2,2l14,14"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2.333"
+      android:fillColor="#00000000"
+      android:fillType="evenOdd"
+      android:strokeColor="#03B381"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/vector/src/main/res/layout/fragment_create_room.xml b/vector/src/main/res/layout/fragment_create_room.xml
new file mode 100644
index 00000000..f5eeeb31
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_create_room.xml
@@ -0,0 +1,71 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/createRoomToolbar"
+            android:layout_width="0dp"
+            android:layout_height="?actionBarSize"
+            android:elevation="4dp"
+            app:contentInsetStartWithNavigation="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:id="@+id/createRoomClose"
+                    android:layout_width="@dimen/layout_touch_size"
+                    android:layout_height="@dimen/layout_touch_size"
+                    android:scaleType="center"
+                    android:src="@drawable/ic_x_18dp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/createRoomTitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:text="@string/create_room_title"
+                    android:textColor="?riotx_text_primary"
+                    android:textSize="18sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
+                    app:layout_constraintStart_toEndOf="@+id/createRoomClose"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.appcompat.widget.Toolbar>
+
+        <com.airbnb.epoxy.EpoxyRecyclerView
+            android:id="@+id/createRoomForm"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/createRoomToolbar"
+            tools:listitem="@layout/item_form_switch" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
diff --git a/vector/src/main/res/layout/item_form_switch.xml b/vector/src/main/res/layout/item_form_switch.xml
new file mode 100644
index 00000000..5757c4b8
--- /dev/null
+++ b/vector/src/main/res/layout/item_form_switch.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background"
+    android:minHeight="@dimen/item_form_min_height">
+
+    <TextView
+        android:id="@+id/formSwitchTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginLeft="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        android:layout_marginRight="@dimen/layout_horizontal_margin"
+        android:duplicateParentState="true"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?riotx_text_primary"
+        android:textSize="15sp"
+        app:layout_constraintBottom_toTopOf="@+id/formSwitchSummary"
+        app:layout_constraintEnd_toStartOf="@+id/formSwitchSwitch"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@string/create_room_public_title" />
+
+    <TextView
+        android:id="@+id/formSwitchSummary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:textColor="?riotx_text_secondary"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toTopOf="@+id/formSwitchDivider"
+        app:layout_constraintStart_toStartOf="@+id/formSwitchTitle"
+        app:layout_constraintTop_toBottomOf="@+id/formSwitchTitle"
+        tools:text="@string/create_room_public_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/formSwitchSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="19dp"
+        android:layout_marginRight="19dp"
+        app:layout_constraintBottom_toTopOf="@+id/formSwitchDivider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/formSwitchDivider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?riotx_header_panel_border_mobile"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_form_text_input.xml b/vector/src/main/res/layout/item_form_text_input.xml
new file mode 100644
index 00000000..775489c5
--- /dev/null
+++ b/vector/src/main/res/layout/item_form_text_input.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?riotx_background"
+    android:minHeight="@dimen/item_form_min_height">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/formTextInputTextInputLayout"
+        style="@style/VectorTextInputLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/layout_horizontal_margin"
+        android:layout_marginEnd="@dimen/layout_horizontal_margin"
+        app:layout_constraintBottom_toTopOf="@+id/formTextInputDivider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/formTextInputTextInputEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:hint="@string/create_room_name_hint" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <View
+        android:id="@+id/formTextInputDivider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="?riotx_header_panel_border_mobile"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/menu/vector_room_creation.xml b/vector/src/main/res/menu/vector_room_creation.xml
index 5b021630..42a21da9 100755
--- a/vector/src/main/res/menu/vector_room_creation.xml
+++ b/vector/src/main/res/menu/vector_room_creation.xml
@@ -2,13 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="org.matrix.vector.activity.VectorRoomCreationActivity">
+    tools:context=".features.roomdirectory.RoomDirectoryActivity">
 
     <item
         android:id="@+id/action_create_room"
-        android:icon="@drawable/ic_material_done_white"
-        android:orderInCategory="0"
-        android:title="@string/room_participants_create"
+        android:title="@string/create_room_action_create"
         app:showAsAction="always" />
 
 </menu>
diff --git a/vector/src/main/res/values/dimens.xml b/vector/src/main/res/values/dimens.xml
index 886cde2e..ae85e35b 100644
--- a/vector/src/main/res/values/dimens.xml
+++ b/vector/src/main/res/values/dimens.xml
@@ -27,4 +27,7 @@
     <dimen name="pill_min_height">20dp</dimen>
     <dimen name="pill_text_padding">4dp</dimen>
 
+
+    <dimen name="item_form_min_height">76dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 8d39ffe7..7b47fd21 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -42,4 +42,13 @@
     <string name="fab_menu_create_room">"Rooms"</string>
     <string name="fab_menu_create_chat">"Direct Messages"</string>
 
+    <!-- Create room screen -->
+    <string name="create_room_title">"New Room"</string>
+    <string name="create_room_action_create">"CREATE"</string>
+    <string name="create_room_name_hint">"Room name"</string>
+    <string name="create_room_public_title">"Public"</string>
+    <string name="create_room_public_description">"Anyone will be able to join this room"</string>
+    <string name="create_room_directory_title">"Room Directory"</string>
+    <string name="create_room_directory_description">"Publish this room in the room directory"</string>
+
 </resources>
\ No newline at end of file

From aa95ce3d022933e80d58a3187336b74aa6a3d520 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 07:57:32 +0200
Subject: [PATCH 04/15] Create room screen - Better navigation pattern

---
 .../core/mvrx/NavigationViewModel.kt          | 38 +++++++++++++++++++
 .../features/form/FormEditTextItem.kt         | 15 ++++----
 .../roomdirectory/PublicRoomsFragment.kt      |  4 +-
 .../roomdirectory/RoomDirectoryActivity.kt    | 20 +++++++++-
 .../RoomDirectoryNavigationViewModel.kt       | 23 +++++++++++
 .../createroom/CreateRoomFragment.kt          |  7 +++-
 .../createroom/CreateRoomViewModel.kt         |  3 +-
 .../picker/RoomDirectoryPickerFragment.kt     |  6 ++-
 8 files changed, 99 insertions(+), 17 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt
 create mode 100644 vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt

diff --git a/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt b/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt
new file mode 100644
index 00000000..70c04f10
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.core.mvrx
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.airbnb.mvrx.MvRxState
+import im.vector.riotredesign.core.platform.VectorViewModel
+import im.vector.riotredesign.core.utils.LiveEvent
+
+// MvRx require a state with at least one attribute
+data class NavigationState(val dummy: Boolean = false) : MvRxState
+
+abstract class NavigationViewModel<NavigationClass>(initialState: NavigationState) : VectorViewModel<NavigationState>(initialState) {
+
+    private val _navigateTo = MutableLiveData<LiveEvent<NavigationClass>>()
+    val navigateTo: LiveData<LiveEvent<NavigationClass>>
+        get() = _navigateTo
+
+
+    fun goTo(navigation: NavigationClass) {
+        _navigateTo.postValue(LiveEvent(navigation))
+    }
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
index 2d60a9c0..046d09f7 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
@@ -40,6 +40,11 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     @EpoxyAttribute
     var onTextChange: ((String) -> Unit)? = null
 
+    private val onTextChangeListener = object : SimpleTextWatcher() {
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+            onTextChange?.invoke(s.toString())
+        }
+    }
 
     override fun bind(holder: Holder) {
         holder.textInputLayout.isEnabled = enabled
@@ -51,11 +56,7 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
         }
         holder.textInputEditText.isEnabled = enabled
 
-        holder.textInputEditText.addTextChangedListener(object : SimpleTextWatcher() {
-            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-                onTextChange?.invoke(s.toString())
-            }
-        })
+        holder.textInputEditText.addTextChangedListener(onTextChangeListener)
     }
 
     override fun shouldSaveViewState(): Boolean {
@@ -64,9 +65,7 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
 
     override fun unbind(holder: Holder) {
         super.unbind(holder)
-
-        // TODO Remove onTextChanged?
-
+        holder.textInputEditText.removeTextChangedListener(onTextChangeListener)
     }
 
     class Holder : VectorEpoxyHolder() {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
index 7b8e88ff..e5524256 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
@@ -49,6 +49,7 @@ import java.util.concurrent.TimeUnit
 class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback {
 
     private val viewModel: RoomDirectoryViewModel by activityViewModel()
+    private val navigationViewModel: RoomDirectoryNavigationViewModel by activityViewModel()
     private val publicRoomsController: PublicRoomsController by inject()
     private val errorFormatter: ErrorFormatter by inject()
 
@@ -76,8 +77,7 @@ class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback
                 .disposeOnDestroy()
 
         publicRoomsCreateNewRoom.setOnClickListener {
-            // TODO Not the best navigation pattern
-            (vectorBaseActivity as? RoomDirectoryActivity)?.gotoCreateRoom()
+            navigationViewModel.goTo(RoomDirectoryActivity.Navigation.CreateRoom)
         }
 
         viewModel.joinRoomErrorLiveData.observe(this, Observer {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
index 63907621..c025e828 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
@@ -17,6 +17,8 @@
 package im.vector.riotredesign.features.roomdirectory
 
 import android.os.Bundle
+import androidx.lifecycle.Observer
+import com.airbnb.mvrx.viewModel
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.extensions.addFragment
 import im.vector.riotredesign.core.extensions.addFragmentToBackstack
@@ -27,6 +29,14 @@ import org.koin.android.scope.ext.android.getOrCreateScope
 
 class RoomDirectoryActivity : VectorBaseActivity() {
 
+    // Supported navigation actions for this Activity
+    sealed class Navigation {
+        object Back : Navigation()
+        object CreateRoom : Navigation()
+    }
+
+
+    private val navigationViewModel: RoomDirectoryNavigationViewModel by viewModel()
 
     override fun getLayoutRes() = R.layout.activity_simple
 
@@ -34,6 +44,13 @@ class RoomDirectoryActivity : VectorBaseActivity() {
         super.onCreate(savedInstanceState)
 
         bindScope(getOrCreateScope(RoomDirectoryModule.ROOM_DIRECTORY_SCOPE))
+
+        navigationViewModel.navigateTo.observe(this, Observer { liveEvent ->
+            when (liveEvent.getContentIfNotHandled() ?: return@Observer) {
+                is Navigation.Back       -> onBackPressed()
+                is Navigation.CreateRoom -> gotoCreateRoom()
+            }
+        })
     }
 
     override fun initUiAndData() {
@@ -42,8 +59,7 @@ class RoomDirectoryActivity : VectorBaseActivity() {
         }
     }
 
-
-    fun gotoCreateRoom() {
+    private fun gotoCreateRoom() {
         addFragmentToBackstack(CreateRoomFragment(), R.id.simpleFragmentContainer)
     }
 }
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
new file mode 100644
index 00000000..d38c9ca1
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.roomdirectory
+
+import im.vector.riotredesign.core.mvrx.NavigationState
+import im.vector.riotredesign.core.mvrx.NavigationViewModel
+
+class RoomDirectoryNavigationViewModel(initialState: NavigationState)
+    : NavigationViewModel<RoomDirectoryActivity.Navigation>(initialState)
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
index 58630118..8aa01e9c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -20,11 +20,14 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity
 import im.vector.riotredesign.features.roomdirectory.RoomDirectoryModule
+import im.vector.riotredesign.features.roomdirectory.RoomDirectoryNavigationViewModel
 import kotlinx.android.synthetic.main.fragment_create_room.*
 import org.koin.android.ext.android.inject
 import org.koin.android.scope.ext.android.bindScope
@@ -33,6 +36,7 @@ import timber.log.Timber
 
 class CreateRoomFragment : VectorBaseFragment(), CreateRoomController.Listener {
 
+    private val navigationViewModel: RoomDirectoryNavigationViewModel by activityViewModel()
     private val viewModel: CreateRoomViewModel by fragmentViewModel()
     private val createRoomController: CreateRoomController by inject()
 
@@ -49,8 +53,7 @@ class CreateRoomFragment : VectorBaseFragment(), CreateRoomController.Listener {
         setupRecyclerView()
 
         createRoomClose.setOnClickListener {
-            // TODO Not the best way to manage Fragment Backstack...
-            vectorBaseActivity.onBackPressed()
+            navigationViewModel.goTo(RoomDirectoryActivity.Navigation.Back)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 125330db..3790381a 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -40,7 +40,7 @@ class CreateRoomViewModel(initialState: CreateRoomViewState,
 
     fun setName(newName: String) = setState { copy(roomName = newName) }
 
-    fun setIsPublic(value: Boolean) = setState { copy(isPublic = value) }
+    fun setIsPublic(isPublic: Boolean) = setState { copy(isPublic = isPublic) }
 
     fun setIsInRoomDirectory(isInRoomDirectory: Boolean) = setState { copy(isInRoomDirectory = isInRoomDirectory) }
 
@@ -59,6 +59,7 @@ class CreateRoomViewModel(initialState: CreateRoomViewState,
             // Directory visibility
             visibility = if (state.isInRoomDirectory) RoomDirectoryVisibility.PUBLIC else RoomDirectoryVisibility.PRIVATE
 
+            // Public room
             preset = if (state.isPublic) CreateRoomPreset.PRESET_PUBLIC_CHAT else CreateRoomPreset.PRESET_PRIVATE_CHAT
         }
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
index 51369a91..63a62833 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
@@ -26,7 +26,9 @@ import com.airbnb.mvrx.withState
 import im.vector.matrix.android.api.session.room.model.thirdparty.RoomDirectoryData
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity
 import im.vector.riotredesign.features.roomdirectory.RoomDirectoryModule
+import im.vector.riotredesign.features.roomdirectory.RoomDirectoryNavigationViewModel
 import im.vector.riotredesign.features.roomdirectory.RoomDirectoryViewModel
 import kotlinx.android.synthetic.main.fragment_room_directory_picker.*
 import org.koin.android.ext.android.inject
@@ -39,6 +41,7 @@ import timber.log.Timber
 class RoomDirectoryPickerFragment : VectorBaseFragment(), RoomDirectoryPickerController.Callback {
 
     private val viewModel: RoomDirectoryViewModel by activityViewModel()
+    private val navigationViewModel: RoomDirectoryNavigationViewModel by activityViewModel()
     private val pickerViewModel: RoomDirectoryPickerViewModel by fragmentViewModel()
     private val roomDirectoryPickerController: RoomDirectoryPickerController by inject()
 
@@ -88,8 +91,7 @@ class RoomDirectoryPickerFragment : VectorBaseFragment(), RoomDirectoryPickerCon
         Timber.v("onRoomDirectoryClicked: $roomDirectoryData")
         viewModel.setRoomDirectoryData(roomDirectoryData)
 
-        // TODO Not the best way to manage Fragment Backstack...
-        vectorBaseActivity.onBackPressed()
+        navigationViewModel.goTo(RoomDirectoryActivity.Navigation.Back)
     }
 
     override fun retry() {

From 77fc793e89c907ab5877e56dfb5b3bb4f031f84c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 08:23:19 +0200
Subject: [PATCH 05/15] Create room screen - Navigate to freshly created room

---
 .../features/roomdirectory/RoomDirectoryActivity.kt       | 2 ++
 .../roomdirectory/createroom/CreateRoomFragment.kt        | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
index c025e828..1351a25e 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
@@ -33,6 +33,7 @@ class RoomDirectoryActivity : VectorBaseActivity() {
     sealed class Navigation {
         object Back : Navigation()
         object CreateRoom : Navigation()
+        object Close : Navigation()
     }
 
 
@@ -49,6 +50,7 @@ class RoomDirectoryActivity : VectorBaseActivity() {
             when (liveEvent.getContentIfNotHandled() ?: return@Observer) {
                 is Navigation.Back       -> onBackPressed()
                 is Navigation.CreateRoom -> gotoCreateRoom()
+                is Navigation.Close      -> finish()
             }
         })
     }
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
index 8aa01e9c..f1944d58 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -95,8 +95,12 @@ class CreateRoomFragment : VectorBaseFragment(), CreateRoomController.Listener {
     }
 
     override fun invalidate() = withState(viewModel) { state ->
-        if (state.asyncCreateRoomRequest is Success) {
-            vectorBaseActivity.notImplemented("navigate to freshly created room")
+        val async = state.asyncCreateRoomRequest
+        if (async is Success) {
+            // Navigate to freshly created room
+            navigator.openRoom(async())
+
+            navigationViewModel.goTo(RoomDirectoryActivity.Navigation.Close)
         } else {
             // Populate list with Epoxy
             createRoomController.setData(state)

From 4f044c0cd6010578ed1dda6121bb67622ba49f1e Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 08:27:27 +0200
Subject: [PATCH 06/15] Create room screen - Navigate to change protocol

---
 .../features/roomdirectory/PublicRoomsFragment.kt    |  2 +-
 .../features/roomdirectory/RoomDirectoryActivity.kt  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
index e5524256..bb079b02 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
@@ -91,7 +91,7 @@ class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_room_directory_change_protocol -> {
-                vectorBaseActivity.addFragmentToBackstack(RoomDirectoryPickerFragment(), R.id.simpleFragmentContainer)
+                navigationViewModel.goTo(RoomDirectoryActivity.Navigation.ChangeProtocol)
                 true
             }
             else                                     ->
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
index 1351a25e..083f1d88 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
@@ -24,6 +24,7 @@ import im.vector.riotredesign.core.extensions.addFragment
 import im.vector.riotredesign.core.extensions.addFragmentToBackstack
 import im.vector.riotredesign.core.platform.VectorBaseActivity
 import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomFragment
+import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerFragment
 import org.koin.android.scope.ext.android.bindScope
 import org.koin.android.scope.ext.android.getOrCreateScope
 
@@ -34,6 +35,7 @@ class RoomDirectoryActivity : VectorBaseActivity() {
         object Back : Navigation()
         object CreateRoom : Navigation()
         object Close : Navigation()
+        object ChangeProtocol : Navigation()
     }
 
 
@@ -48,9 +50,10 @@ class RoomDirectoryActivity : VectorBaseActivity() {
 
         navigationViewModel.navigateTo.observe(this, Observer { liveEvent ->
             when (liveEvent.getContentIfNotHandled() ?: return@Observer) {
-                is Navigation.Back       -> onBackPressed()
-                is Navigation.CreateRoom -> gotoCreateRoom()
-                is Navigation.Close      -> finish()
+                is Navigation.Back           -> onBackPressed()
+                is Navigation.CreateRoom     -> addFragmentToBackstack(CreateRoomFragment(), R.id.simpleFragmentContainer)
+                is Navigation.ChangeProtocol -> addFragmentToBackstack(RoomDirectoryPickerFragment(), R.id.simpleFragmentContainer)
+                is Navigation.Close          -> finish()
             }
         })
     }
@@ -61,7 +64,4 @@ class RoomDirectoryActivity : VectorBaseActivity() {
         }
     }
 
-    private fun gotoCreateRoom() {
-        addFragmentToBackstack(CreateRoomFragment(), R.id.simpleFragmentContainer)
-    }
 }
\ No newline at end of file

From 598245531a59b0bb01a11316e9be449323453bd7 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 13:45:34 +0200
Subject: [PATCH 07/15] Fix compilation issue after rebase

---
 .../vector/riotredesign/features/navigation/DefaultNavigator.kt | 2 --
 .../features/roomdirectory/createroom/CreateRoomFragment.kt     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt
index 44c1cfe3..e084b798 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/navigation/DefaultNavigator.kt
@@ -16,10 +16,8 @@
 
 package im.vector.riotredesign.features.navigation
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import androidx.fragment.app.Fragment
 import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
 import im.vector.riotredesign.features.debug.DebugMenuActivity
 import im.vector.riotredesign.features.home.room.detail.RoomDetailActivity
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
index f1944d58..0ce4f1f6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -98,7 +98,7 @@ class CreateRoomFragment : VectorBaseFragment(), CreateRoomController.Listener {
         val async = state.asyncCreateRoomRequest
         if (async is Success) {
             // Navigate to freshly created room
-            navigator.openRoom(async())
+            navigator.openRoom(async(), requireActivity())
 
             navigationViewModel.goTo(RoomDirectoryActivity.Navigation.Close)
         } else {

From ad8baf8091c86f7c8e8b7c3cad302af27a02277a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 14:13:14 +0200
Subject: [PATCH 08/15] Fix screen rotation issue

---
 .../im/vector/riotredesign/features/form/FormEditTextItem.kt | 5 +++--
 .../im/vector/riotredesign/features/form/FormSwitchItem.kt   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
index 046d09f7..e714f61e 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/form/FormEditTextItem.kt
@@ -16,6 +16,7 @@
 
 package im.vector.riotredesign.features.form
 
+import android.text.Editable
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.textfield.TextInputEditText
@@ -41,7 +42,7 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     var onTextChange: ((String) -> Unit)? = null
 
     private val onTextChangeListener = object : SimpleTextWatcher() {
-        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+        override fun afterTextChanged(s: Editable) {
             onTextChange?.invoke(s.toString())
         }
     }
@@ -60,7 +61,7 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
     }
 
     override fun shouldSaveViewState(): Boolean {
-        return true
+        return false
     }
 
     override fun unbind(holder: Holder) {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt b/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt
index 96bb2e07..6d8f6272 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/form/FormSwitchItem.kt
@@ -57,7 +57,7 @@ abstract class FormSwitchItem : VectorEpoxyModel<FormSwitchItem.Holder>() {
     }
 
     override fun shouldSaveViewState(): Boolean {
-        return true
+        return false
     }
 
     override fun unbind(holder: Holder) {

From 933e06a7effc7697f29bafddcb0dfd0ea53d295b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 15:24:25 +0200
Subject: [PATCH 09/15] Auto collapse toolbar

---
 .../main/res/layout/fragment_public_rooms.xml | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index 610e9233..de6fa436 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -5,22 +5,33 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/publicRoomsCoordinator"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?riotx_header_panel_background">
+    android:layout_height="match_parent">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <com.airbnb.epoxy.EpoxyRecyclerView
+        android:id="@+id/publicRoomsList"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="?riotx_header_panel_background"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:listitem="@layout/item_public_room" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        style="@style/VectorAppBarLayoutStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="4dp">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/publicRoomsToolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="?attr/actionBarSize"
             android:elevation="4dp"
+            android:minHeight="0dp"
             app:contentInsetStartWithNavigation="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlways">
 
             <!-- Note: Background is modified in the code for other themes -->
             <EditText
@@ -52,6 +63,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginLeft="16dp"
+            android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:minHeight="@dimen/layout_touch_size"
             android:text="@string/create_new_room"
@@ -61,16 +73,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/publicRoomsToolbar" />
 
-        <com.airbnb.epoxy.EpoxyRecyclerView
-            android:id="@+id/publicRoomsList"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/publicRoomsCreateNewRoom"
-            tools:listitem="@layout/item_public_room" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

From 4eab0a3704ab438dc5d59b7c3b648c2aa1b4cfcf Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 15:35:05 +0200
Subject: [PATCH 10/15] Add foreground attribute

---
 vector/src/main/res/layout/item_error_retry.xml    | 1 +
 vector/src/main/res/layout/item_no_result.xml      | 1 +
 vector/src/main/res/layout/item_public_room.xml    | 1 +
 vector/src/main/res/layout/item_room.xml           | 3 ++-
 vector/src/main/res/layout/item_room_category.xml  | 1 +
 vector/src/main/res/layout/item_room_directory.xml | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/res/layout/item_error_retry.xml b/vector/src/main/res/layout/item_error_retry.xml
index dd3eb0a4..f49beaea 100644
--- a/vector/src/main/res/layout/item_error_retry.xml
+++ b/vector/src/main/res/layout/item_error_retry.xml
@@ -5,6 +5,7 @@
     android:id="@+id/progressBar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?riotx_background"
     android:padding="16dp">
 
     <TextView
diff --git a/vector/src/main/res/layout/item_no_result.xml b/vector/src/main/res/layout/item_no_result.xml
index a64eda59..833a952c 100644
--- a/vector/src/main/res/layout/item_no_result.xml
+++ b/vector/src/main/res/layout/item_no_result.xml
@@ -3,6 +3,7 @@
     android:id="@+id/itemNoResultText"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?riotx_background"
     android:gravity="center"
     android:padding="16dp"
     android:text="@string/no_result_placeholder" />
diff --git a/vector/src/main/res/layout/item_public_room.xml b/vector/src/main/res/layout/item_public_room.xml
index 6970e100..5c28baad 100644
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@@ -9,6 +9,7 @@
     android:background="?riotx_background"
     android:clickable="true"
     android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
     android:minHeight="97dp">
 
     <ImageView
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index bde8e856..1166bbff 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -7,7 +7,8 @@
     android:layout_height="wrap_content"
     android:background="?riotx_background"
     android:clickable="true"
-    android:focusable="true">
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground">
 
     <ImageView
         android:id="@+id/roomAvatarImageView"
diff --git a/vector/src/main/res/layout/item_room_category.xml b/vector/src/main/res/layout/item_room_category.xml
index f1f4b886..c6bb55f8 100644
--- a/vector/src/main/res/layout/item_room_category.xml
+++ b/vector/src/main/res/layout/item_room_category.xml
@@ -13,6 +13,7 @@
     android:paddingLeft="@dimen/layout_horizontal_margin"
     android:paddingTop="@dimen/layout_vertical_margin"
     android:paddingEnd="@dimen/layout_horizontal_margin"
+    android:foreground="?attr/selectableItemBackground"
     android:paddingRight="@dimen/layout_horizontal_margin"
     android:paddingBottom="8dp">
 
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 6babf515..64679f7b 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -6,6 +6,7 @@
     android:id="@+id/itemRoomDirectoryLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?riotx_background"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground">

From b437837809226599ae4a43b4a3a627826dada736 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 16:35:51 +0200
Subject: [PATCH 11/15] Ganfra's review: use RealmQueryLatch

---
 .../internal/database/RealmQueryLatch.kt      | 29 +++++------
 .../session/room/create/CreateRoomTask.kt     | 48 +++----------------
 2 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
index 8db44148..700f54c7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
@@ -18,12 +18,7 @@ package im.vector.matrix.android.internal.database
 
 import android.os.Handler
 import android.os.HandlerThread
-import io.realm.Realm
-import io.realm.RealmChangeListener
-import io.realm.RealmConfiguration
-import io.realm.RealmObject
-import io.realm.RealmQuery
-import io.realm.RealmResults
+import io.realm.*
 import java.util.concurrent.CountDownLatch
 
 private const val THREAD_NAME = "REALM_QUERY_LATCH"
@@ -39,15 +34,21 @@ class RealmQueryLatch<E : RealmObject>(private val realmConfiguration: RealmConf
         val runnable = Runnable {
             val realm = Realm.getInstance(realmConfiguration)
             val result = realmQueryBuilder(realm).findAllAsync()
-            result.addChangeListener(object : RealmChangeListener<RealmResults<E>> {
-                override fun onChange(t: RealmResults<E>) {
-                    if (t.isNotEmpty()) {
-                        result.removeChangeListener(this)
-                        realm.close()
-                        latch.countDown()
+
+            if (result.isEmpty()) {
+                result.addChangeListener(object : RealmChangeListener<RealmResults<E>> {
+                    override fun onChange(t: RealmResults<E>) {
+                        if (t.isNotEmpty()) {
+                            result.removeChangeListener(this)
+                            realm.close()
+                            latch.countDown()
+                        }
                     }
-                }
-            })
+                })
+            } else {
+                realm.close()
+                latch.countDown()
+            }
         }
         handler.post(runnable)
         latch.await()
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
index 45c3c8b1..7ac8e83e 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/create/CreateRoomTask.kt
@@ -16,23 +16,16 @@
 
 package im.vector.matrix.android.internal.session.room.create
 
-import android.os.Handler
-import android.os.HandlerThread
 import arrow.core.Try
 import im.vector.matrix.android.api.session.room.model.create.CreateRoomParams
 import im.vector.matrix.android.api.session.room.model.create.CreateRoomResponse
+import im.vector.matrix.android.internal.database.RealmQueryLatch
 import im.vector.matrix.android.internal.database.model.RoomEntity
 import im.vector.matrix.android.internal.database.model.RoomEntityFields
 import im.vector.matrix.android.internal.network.executeRequest
 import im.vector.matrix.android.internal.session.room.RoomAPI
 import im.vector.matrix.android.internal.task.Task
-import io.realm.Realm
-import io.realm.RealmChangeListener
 import io.realm.RealmConfiguration
-import io.realm.RealmResults
-import java.util.concurrent.CountDownLatch
-
-private const val THREAD_NAME = "CREATE_ROOM_"
 
 internal interface CreateRoomTask : Task<CreateRoomParams, String>
 
@@ -47,42 +40,15 @@ internal class DefaultCreateRoomTask(private val roomAPI: RoomAPI,
         }.flatMap { createRoomResponse ->
             val roomId = createRoomResponse.roomId!!
 
-            val latch = CountDownLatch(1)
-
-            // Wait for room to come back from the sync (but it can maybe be in the DB is the sync response is received before)
-            val handlerThread = HandlerThread(THREAD_NAME + hashCode())
-            handlerThread.start()
-            val handler = Handler(handlerThread.looper)
-
             // TODO Maybe do the same code for join room request ?
-            handler.post {
-                val realm = Realm.getInstance(realmConfiguration)
-
-                if (realm.where(RoomEntity::class.java)
-                                .equalTo(RoomEntityFields.ROOM_ID, roomId)
-                                .findAll()
-                                .isEmpty()) {
-                    val result = realm.where(RoomEntity::class.java)
-                            .equalTo(RoomEntityFields.ROOM_ID, roomId)
-                            .findAllAsync()
-
-                    result.addChangeListener(object : RealmChangeListener<RealmResults<RoomEntity>> {
-                        override fun onChange(t: RealmResults<RoomEntity>) {
-                            if (t.isNotEmpty()) {
-                                result.removeChangeListener(this)
-                                realm.close()
-                                latch.countDown()
-                            }
-                        }
-                    })
-                } else {
-                    realm.close()
-                    latch.countDown()
-                }
+            // Wait for room to come back from the sync (but it can maybe be in the DB is the sync response is received before)
+            val rql = RealmQueryLatch<RoomEntity>(realmConfiguration) { realm ->
+                realm.where(RoomEntity::class.java)
+                        .equalTo(RoomEntityFields.ROOM_ID, roomId)
             }
 
-            latch.await()
-            handlerThread.quit()
+            rql.await()
+
             return Try.just(roomId)
         }
     }

From c0be04f46c81c307d2140e588728dd9d0c8c6e09 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 16:39:46 +0200
Subject: [PATCH 12/15] Ganfra's review: use observeEvent

---
 .../features/roomdirectory/RoomDirectoryActivity.kt       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
index 083f1d88..87b136a6 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
@@ -17,11 +17,11 @@
 package im.vector.riotredesign.features.roomdirectory
 
 import android.os.Bundle
-import androidx.lifecycle.Observer
 import com.airbnb.mvrx.viewModel
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.extensions.addFragment
 import im.vector.riotredesign.core.extensions.addFragmentToBackstack
+import im.vector.riotredesign.core.extensions.observeEvent
 import im.vector.riotredesign.core.platform.VectorBaseActivity
 import im.vector.riotredesign.features.roomdirectory.createroom.CreateRoomFragment
 import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerFragment
@@ -48,14 +48,14 @@ class RoomDirectoryActivity : VectorBaseActivity() {
 
         bindScope(getOrCreateScope(RoomDirectoryModule.ROOM_DIRECTORY_SCOPE))
 
-        navigationViewModel.navigateTo.observe(this, Observer { liveEvent ->
-            when (liveEvent.getContentIfNotHandled() ?: return@Observer) {
+        navigationViewModel.navigateTo.observeEvent(this) { navigation ->
+            when (navigation) {
                 is Navigation.Back           -> onBackPressed()
                 is Navigation.CreateRoom     -> addFragmentToBackstack(CreateRoomFragment(), R.id.simpleFragmentContainer)
                 is Navigation.ChangeProtocol -> addFragmentToBackstack(RoomDirectoryPickerFragment(), R.id.simpleFragmentContainer)
                 is Navigation.Close          -> finish()
             }
-        })
+        }
     }
 
     override fun initUiAndData() {

From b48c92029220217a018181ab1fd3f9efc8f3515b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 16:45:42 +0200
Subject: [PATCH 13/15] Ganfra's review: use simple ViewModel

---
 .../vector/riotredesign/core/mvrx/NavigationViewModel.kt  | 8 ++------
 .../features/roomdirectory/PublicRoomsFragment.kt         | 7 ++++---
 .../features/roomdirectory/RoomDirectoryActivity.kt       | 6 ++++--
 .../roomdirectory/RoomDirectoryNavigationViewModel.kt     | 4 +---
 .../roomdirectory/createroom/CreateRoomFragment.kt        | 6 ++++--
 .../roomdirectory/picker/RoomDirectoryPickerFragment.kt   | 5 ++++-
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt b/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt
index 70c04f10..87b09c37 100644
--- a/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt
+++ b/vector/src/main/java/im/vector/riotredesign/core/mvrx/NavigationViewModel.kt
@@ -18,14 +18,10 @@ package im.vector.riotredesign.core.mvrx
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import com.airbnb.mvrx.MvRxState
-import im.vector.riotredesign.core.platform.VectorViewModel
+import androidx.lifecycle.ViewModel
 import im.vector.riotredesign.core.utils.LiveEvent
 
-// MvRx require a state with at least one attribute
-data class NavigationState(val dummy: Boolean = false) : MvRxState
-
-abstract class NavigationViewModel<NavigationClass>(initialState: NavigationState) : VectorViewModel<NavigationState>(initialState) {
+abstract class NavigationViewModel<NavigationClass> : ViewModel() {
 
     private val _navigateTo = MutableLiveData<LiveEvent<NavigationClass>>()
     val navigateTo: LiveData<LiveEvent<NavigationClass>>
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
index bb079b02..f28c5576 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.epoxy.EpoxyVisibilityTracker
 import com.airbnb.mvrx.activityViewModel
@@ -29,9 +30,7 @@ import com.jakewharton.rxbinding2.widget.RxTextView
 import im.vector.matrix.android.api.session.room.model.roomdirectory.PublicRoom
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.error.ErrorFormatter
-import im.vector.riotredesign.core.extensions.addFragmentToBackstack
 import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerFragment
 import im.vector.riotredesign.features.themes.ThemeUtils
 import io.reactivex.rxkotlin.subscribeBy
 import kotlinx.android.synthetic.main.fragment_public_rooms.*
@@ -49,7 +48,7 @@ import java.util.concurrent.TimeUnit
 class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback {
 
     private val viewModel: RoomDirectoryViewModel by activityViewModel()
-    private val navigationViewModel: RoomDirectoryNavigationViewModel by activityViewModel()
+    private lateinit var navigationViewModel: RoomDirectoryNavigationViewModel
     private val publicRoomsController: PublicRoomsController by inject()
     private val errorFormatter: ErrorFormatter by inject()
 
@@ -103,6 +102,8 @@ class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback
         super.onActivityCreated(savedInstanceState)
         bindScope(getOrCreateScope(RoomDirectoryModule.ROOM_DIRECTORY_SCOPE))
 
+        navigationViewModel = ViewModelProviders.of(requireActivity()).get(RoomDirectoryNavigationViewModel::class.java)
+
         setupRecyclerView()
     }
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
index 87b136a6..6f1e79e4 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryActivity.kt
@@ -17,7 +17,7 @@
 package im.vector.riotredesign.features.roomdirectory
 
 import android.os.Bundle
-import com.airbnb.mvrx.viewModel
+import androidx.lifecycle.ViewModelProviders
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.extensions.addFragment
 import im.vector.riotredesign.core.extensions.addFragmentToBackstack
@@ -39,7 +39,7 @@ class RoomDirectoryActivity : VectorBaseActivity() {
     }
 
 
-    private val navigationViewModel: RoomDirectoryNavigationViewModel by viewModel()
+    private lateinit var navigationViewModel: RoomDirectoryNavigationViewModel
 
     override fun getLayoutRes() = R.layout.activity_simple
 
@@ -48,6 +48,8 @@ class RoomDirectoryActivity : VectorBaseActivity() {
 
         bindScope(getOrCreateScope(RoomDirectoryModule.ROOM_DIRECTORY_SCOPE))
 
+        navigationViewModel = ViewModelProviders.of(this).get(RoomDirectoryNavigationViewModel::class.java)
+
         navigationViewModel.navigateTo.observeEvent(this) { navigation ->
             when (navigation) {
                 is Navigation.Back           -> onBackPressed()
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
index d38c9ca1..8183b787 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/RoomDirectoryNavigationViewModel.kt
@@ -16,8 +16,6 @@
 
 package im.vector.riotredesign.features.roomdirectory
 
-import im.vector.riotredesign.core.mvrx.NavigationState
 import im.vector.riotredesign.core.mvrx.NavigationViewModel
 
-class RoomDirectoryNavigationViewModel(initialState: NavigationState)
-    : NavigationViewModel<RoomDirectoryActivity.Navigation>(initialState)
\ No newline at end of file
+class RoomDirectoryNavigationViewModel : NavigationViewModel<RoomDirectoryActivity.Navigation>()
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
index 0ce4f1f6..96e7c60c 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/createroom/CreateRoomFragment.kt
@@ -18,9 +18,9 @@ package im.vector.riotredesign.features.roomdirectory.createroom
 
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import im.vector.riotredesign.R
@@ -36,7 +36,7 @@ import timber.log.Timber
 
 class CreateRoomFragment : VectorBaseFragment(), CreateRoomController.Listener {
 
-    private val navigationViewModel: RoomDirectoryNavigationViewModel by activityViewModel()
+    private lateinit var navigationViewModel: RoomDirectoryNavigationViewModel
     private val viewModel: CreateRoomViewModel by fragmentViewModel()
     private val createRoomController: CreateRoomController by inject()
 
@@ -50,6 +50,8 @@ class CreateRoomFragment : VectorBaseFragment(), CreateRoomController.Listener {
 
         vectorBaseActivity.setSupportActionBar(createRoomToolbar)
 
+        navigationViewModel = ViewModelProviders.of(requireActivity()).get(RoomDirectoryNavigationViewModel::class.java)
+
         setupRecyclerView()
 
         createRoomClose.setOnClickListener {
diff --git a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
index 63a62833..4d1ca98b 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerFragment.kt
@@ -19,6 +19,7 @@ package im.vector.riotredesign.features.roomdirectory.picker
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.View
+import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.mvrx.activityViewModel
 import com.airbnb.mvrx.fragmentViewModel
@@ -41,7 +42,7 @@ import timber.log.Timber
 class RoomDirectoryPickerFragment : VectorBaseFragment(), RoomDirectoryPickerController.Callback {
 
     private val viewModel: RoomDirectoryViewModel by activityViewModel()
-    private val navigationViewModel: RoomDirectoryNavigationViewModel by activityViewModel()
+    private lateinit var navigationViewModel: RoomDirectoryNavigationViewModel
     private val pickerViewModel: RoomDirectoryPickerViewModel by fragmentViewModel()
     private val roomDirectoryPickerController: RoomDirectoryPickerController by inject()
 
@@ -74,6 +75,8 @@ class RoomDirectoryPickerFragment : VectorBaseFragment(), RoomDirectoryPickerCon
         super.onActivityCreated(savedInstanceState)
         bindScope(getOrCreateScope(RoomDirectoryModule.ROOM_DIRECTORY_SCOPE))
 
+        navigationViewModel = ViewModelProviders.of(requireActivity()).get(RoomDirectoryNavigationViewModel::class.java)
+
         setupRecyclerView()
     }
 

From fa297a7b6a025616f25e24bad6e28f4b63b66475 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 16:53:21 +0200
Subject: [PATCH 14/15] Ganfra's review: use NavigationViewModel to open the
 drawer

---
 .../features/home/HomeActivity.kt             | 22 ++++++++++++++-----
 .../features/home/HomeDetailFragment.kt       |  7 +++++-
 .../features/home/HomeNavigationViewModel.kt  | 21 ++++++++++++++++++
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt

diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
index 9ec42de8..379b3373 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
@@ -27,10 +27,12 @@ import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import com.airbnb.mvrx.viewModel
 import im.vector.matrix.android.api.Matrix
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.extensions.hideKeyboard
+import im.vector.riotredesign.core.extensions.observeEvent
 import im.vector.riotredesign.core.extensions.replaceFragment
 import im.vector.riotredesign.core.platform.OnBackPressed
 import im.vector.riotredesign.core.platform.ToolbarConfigurable
@@ -46,7 +48,13 @@ import org.koin.android.scope.ext.android.getOrCreateScope
 
 class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
 
+    // Supported navigation actions for this Activity
+    sealed class Navigation {
+        object OpenDrawer : Navigation()
+    }
+
     private val homeActivityViewModel: HomeActivityViewModel by viewModel()
+    private lateinit var navigationViewModel: HomeNavigationViewModel
     private val homeNavigator by inject<HomeNavigator>()
 
     private var progress: ProgressDialog? = null
@@ -63,6 +71,9 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
         super.onCreate(savedInstanceState)
         bindScope(getOrCreateScope(HomeModule.HOME_SCOPE))
         homeNavigator.activity = this
+
+        navigationViewModel = ViewModelProviders.of(this).get(HomeNavigationViewModel::class.java)
+
         drawerLayout.addDrawerListener(drawerListener)
         if (isFirstCreation()) {
             val homeDrawerFragment = HomeDrawerFragment.newInstance()
@@ -82,6 +93,12 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
                 progress?.dismiss()
             }
         })
+
+        navigationViewModel.navigateTo.observeEvent(this) { navigation ->
+            when (navigation) {
+                is Navigation.OpenDrawer -> drawerLayout.openDrawer(GravityCompat.START)
+            }
+        }
     }
 
     override fun onDestroy() {
@@ -122,11 +139,6 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
         return true
     }
 
-    // Called by HomeDetailFragment
-    fun openDrawer() {
-        drawerLayout.openDrawer(GravityCompat.START)
-    }
-
     override fun onBackPressed() {
         if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
             drawerLayout.closeDrawer(GravityCompat.START)
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt
index 25c38c23..cd47df2d 100644
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeDetailFragment.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
 import androidx.core.view.forEachIndexed
+import androidx.lifecycle.ViewModelProviders
 import com.airbnb.mvrx.args
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -56,6 +57,7 @@ class HomeDetailFragment : VectorBaseFragment() {
     private lateinit var currentDisplayMode: RoomListFragment.DisplayMode
 
     private val viewModel: HomeDetailViewModel by fragmentViewModel()
+    private lateinit var navigationViewModel: HomeNavigationViewModel
 
     override fun getLayoutResId(): Int {
         return R.layout.fragment_home_detail
@@ -65,6 +67,9 @@ class HomeDetailFragment : VectorBaseFragment() {
         super.onActivityCreated(savedInstanceState)
         currentDisplayMode = savedInstanceState?.getSerializable(CURRENT_DISPLAY_MODE) as? RoomListFragment.DisplayMode
                 ?: RoomListFragment.DisplayMode.HOME
+
+        navigationViewModel = ViewModelProviders.of(requireActivity()).get(HomeNavigationViewModel::class.java)
+
         switchDisplayMode(currentDisplayMode)
         setupBottomNavigationView()
         setupToolbar()
@@ -89,7 +94,7 @@ class HomeDetailFragment : VectorBaseFragment() {
                 groupToolbarAvatarImageView
         )
         groupToolbarAvatarImageView.setOnClickListener {
-            (vectorBaseActivity as? HomeActivity)?.openDrawer()
+            navigationViewModel.goTo(HomeActivity.Navigation.OpenDrawer)
         }
     }
 
diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt
new file mode 100644
index 00000000..d922f3ae
--- /dev/null
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeNavigationViewModel.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.riotredesign.features.home
+
+import im.vector.riotredesign.core.mvrx.NavigationViewModel
+
+class HomeNavigationViewModel : NavigationViewModel<HomeActivity.Navigation>()
\ No newline at end of file

From 9772bbe15722825883a59d0388c745e185e8087a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 10 Jun 2019 16:58:48 +0200
Subject: [PATCH 15/15] Ganfra's review: revert change

---
 .../internal/database/RealmQueryLatch.kt      | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
index 700f54c7..64afa3d4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmQueryLatch.kt
@@ -35,20 +35,15 @@ class RealmQueryLatch<E : RealmObject>(private val realmConfiguration: RealmConf
             val realm = Realm.getInstance(realmConfiguration)
             val result = realmQueryBuilder(realm).findAllAsync()
 
-            if (result.isEmpty()) {
-                result.addChangeListener(object : RealmChangeListener<RealmResults<E>> {
-                    override fun onChange(t: RealmResults<E>) {
-                        if (t.isNotEmpty()) {
-                            result.removeChangeListener(this)
-                            realm.close()
-                            latch.countDown()
-                        }
+            result.addChangeListener(object : RealmChangeListener<RealmResults<E>> {
+                override fun onChange(t: RealmResults<E>) {
+                    if (t.isNotEmpty()) {
+                        result.removeChangeListener(this)
+                        realm.close()
+                        latch.countDown()
                     }
-                })
-            } else {
-                realm.close()
-                latch.countDown()
-            }
+                }
+            })
         }
         handler.post(runnable)
         latch.await()