From cc29a387c710b4a9a851e3d1df9b02a5bc7847eb Mon Sep 17 00:00:00 2001
From: ganfra <francois.ganard@gmail.com>
Date: Mon, 29 Oct 2018 14:57:36 +0100
Subject: [PATCH] Start introducing theme on app + branch toolbar to drawer,
 still requires refinements

---
 .idea/caches/build_file_checksums.ser         | Bin 661 -> 659 bytes
 app/src/main/AndroidManifest.xml              |   2 +-
 .../core/platform/RiotFragment.kt             |   5 ++
 .../core/platform/ToolbarConfigurable.kt      |   9 +++
 .../features/home/HomeActivity.kt             |  39 ++++++++++++-
 .../home/detail/RoomDetailFragment.kt         |  27 +++++++--
 .../features/home/list/RoomListFragment.kt    |  17 ++++--
 app/src/main/res/layout/activity_home.xml     |   1 +
 .../main/res/layout/fragment_room_detail.xml  |  20 ++++++-
 app/src/main/res/values-v21/themes_base.xml   |   9 +++
 app/src/main/res/values/colors.xml            |   5 --
 app/src/main/res/values/styles.xml            |   7 ---
 app/src/main/res/values/styles_widget.xml     |   5 ++
 app/src/main/res/values/text_appearances.xml  |   5 ++
 app/src/main/res/values/themes.xml            |   9 +++
 app/src/main/res/values/themes_base.xml       |  13 +++++
 app/src/main/res/values/themes_overlay.xml    |   2 +
 .../main/res/values/themes_overlay_base.xml   |   2 +
 .../matrix/android/api/session/room/Room.kt   |   7 ++-
 .../session/room/model/RoomAvatarContent.kt   |   9 +++
 .../api/session/room/model/RoomSummary.kt     |   5 +-
 .../database/mapper/RoomSummaryMapper.kt      |   6 +-
 .../database/model/RoomSummaryEntity.kt       |   1 +
 .../database/query/EventEntityQueries.kt      |  13 -----
 .../android/internal/session/SessionModule.kt |  11 +++-
 .../internal/session/room/DefaultRoom.kt      |  21 +++++--
 .../session/room/RoomAvatarResolver.kt        |  53 ++++++++++++++++++
 .../session/room/RoomSummaryUpdater.kt        |  10 ++--
 .../room/members/LoadRoomMembersRequest.kt    |   4 +-
 .../room/members/RoomDisplayNameResolver.kt   |  19 +++----
 .../session/room/members/RoomMembers.kt       |  47 ++++++++++++++++
 .../internal/session/sync/RoomSyncHandler.kt  |   6 +-
 32 files changed, 315 insertions(+), 74 deletions(-)
 create mode 100644 app/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt
 create mode 100644 app/src/main/res/values-v21/themes_base.xml
 create mode 100644 app/src/main/res/values/styles_widget.xml
 create mode 100644 app/src/main/res/values/text_appearances.xml
 create mode 100644 app/src/main/res/values/themes.xml
 create mode 100644 app/src/main/res/values/themes_base.xml
 create mode 100644 app/src/main/res/values/themes_overlay.xml
 create mode 100644 app/src/main/res/values/themes_overlay_base.xml
 create mode 100644 matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt
 create mode 100644 matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt
 create mode 100644 matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMembers.kt

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 0636ad2de7b896dcead25548e7297e2f36426773..7d78b39972890635811eb82242fdf631e8d2e89f 100644
GIT binary patch
delta 72
zcmV-O0Jr~@1(OAkm;=8j5RsdS4ks^Fb7gXKFK1zHW^!SZ1p+pcV*xyqBmqB@p8-S@
ef7Z;PlyyDK5#g+$el~%6bN~^P4gwpKR{}n+^%>3p

delta 74
zcmV-Q0JZ;<1(gMmm;<}jNRgX~lcWJZlV|}vlj8wIBAqkc65@?7i4E+OV(}pfPILe%
gFI978a&s?ca$#;`Z)tOrG66OL5tBOs8<SN6K3wG+Hvj+t

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 584955dc..a07bbbeb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/Theme.Riot">
         <activity android:name=".features.login.LoginActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/im/vector/riotredesign/core/platform/RiotFragment.kt b/app/src/main/java/im/vector/riotredesign/core/platform/RiotFragment.kt
index 3f5e3d86..88300a4e 100644
--- a/app/src/main/java/im/vector/riotredesign/core/platform/RiotFragment.kt
+++ b/app/src/main/java/im/vector/riotredesign/core/platform/RiotFragment.kt
@@ -4,6 +4,11 @@ import com.airbnb.mvrx.BaseMvRxFragment
 
 abstract class RiotFragment : BaseMvRxFragment() {
 
+    val riotActivity: RiotActivity by lazy {
+        activity as RiotActivity
+    }
+
+
     override fun invalidate() {
         //no-ops by default
     }
diff --git a/app/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt b/app/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt
new file mode 100644
index 00000000..acaece0b
--- /dev/null
+++ b/app/src/main/java/im/vector/riotredesign/core/platform/ToolbarConfigurable.kt
@@ -0,0 +1,9 @@
+package im.vector.riotredesign.core.platform
+
+import android.support.v7.widget.Toolbar
+
+interface ToolbarConfigurable {
+
+    fun configure(toolbar: Toolbar)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
index 62abf6f2..847045cc 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
@@ -3,10 +3,15 @@ package im.vector.riotredesign.features.home
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.support.v4.view.GravityCompat
+import android.support.v7.app.ActionBarDrawerToggle
+import android.support.v7.widget.Toolbar
 import android.view.Gravity
+import android.view.MenuItem
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.extensions.replaceFragment
 import im.vector.riotredesign.core.platform.RiotActivity
+import im.vector.riotredesign.core.platform.ToolbarConfigurable
 import im.vector.riotredesign.features.home.detail.LoadingRoomDetailFragment
 import im.vector.riotredesign.features.home.detail.RoomDetailFragment
 import im.vector.riotredesign.features.home.list.RoomListFragment
@@ -14,12 +19,13 @@ import kotlinx.android.synthetic.main.activity_home.*
 import org.koin.standalone.StandAloneContext.loadKoinModules
 
 
-class HomeActivity : RiotActivity(), HomeNavigator {
+class HomeActivity : RiotActivity(), HomeNavigator, ToolbarConfigurable {
+
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        loadKoinModules(listOf(HomeModule(this)))
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_home)
-        loadKoinModules(listOf(HomeModule(this)))
         if (savedInstanceState == null) {
             val roomListFragment = RoomListFragment.newInstance()
             val loadingDetail = LoadingRoomDetailFragment.newInstance()
@@ -28,6 +34,35 @@ class HomeActivity : RiotActivity(), HomeNavigator {
         }
     }
 
+    override fun configure(toolbar: Toolbar) {
+        setSupportActionBar(toolbar)
+        supportActionBar?.setHomeButtonEnabled(true)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        val drawerToggle = ActionBarDrawerToggle(this, drawerLayout, toolbar, 0, 0)
+        drawerLayout.addDrawerListener(drawerToggle)
+        drawerToggle.syncState()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            // Android home
+            android.R.id.home -> {
+                drawerLayout.openDrawer(GravityCompat.START)
+                return true
+            }
+        }
+
+        return true
+    }
+
+    override fun onBackPressed() {
+        if (drawerLayout.isDrawerOpen(Gravity.LEFT)) {
+            drawerLayout.closeDrawer(Gravity.LEFT)
+        } else {
+            super.onBackPressed()
+        }
+    }
+
     override fun openRoomDetail(roomId: String) {
         val roomDetailFragment = RoomDetailFragment.newInstance(roomId)
         replaceFragment(roomDetailFragment, R.id.homeDetailFragmentContainer)
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/detail/RoomDetailFragment.kt b/app/src/main/java/im/vector/riotredesign/features/home/detail/RoomDetailFragment.kt
index 10dbcb38..7cf1f473 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/detail/RoomDetailFragment.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/detail/RoomDetailFragment.kt
@@ -11,8 +11,10 @@ import android.view.ViewGroup
 import im.vector.matrix.android.api.Matrix
 import im.vector.matrix.android.api.session.events.model.EnrichedEvent
 import im.vector.matrix.android.api.session.room.Room
+import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.riotredesign.R
 import im.vector.riotredesign.core.platform.RiotFragment
+import im.vector.riotredesign.core.platform.ToolbarConfigurable
 import im.vector.riotredesign.core.utils.FragmentArgumentDelegate
 import kotlinx.android.synthetic.main.fragment_room_detail.*
 import org.koin.android.ext.android.inject
@@ -41,14 +43,19 @@ class RoomDetailFragment : RiotFragment(), TimelineEventAdapter.Callback {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        setupRecyclerView()
         room = currentSession.getRoom(roomId)!!
+        setupRecyclerView()
+        setupToolbar()
         room.loadRoomMembersIfNeeded()
         room.liveTimeline().observe(this, Observer { renderEvents(it) })
+        room.roomSummary.observe(this, Observer { renderRoomSummary(it) })
     }
 
-    private fun renderEvents(events: PagedList<EnrichedEvent>?) {
-        timelineAdapter.submitList(events)
+    private fun setupToolbar() {
+        val parentActivity = riotActivity
+        if (parentActivity is ToolbarConfigurable) {
+            parentActivity.configure(toolbar)
+        }
     }
 
     private fun setupRecyclerView() {
@@ -67,7 +74,19 @@ class RoomDetailFragment : RiotFragment(), TimelineEventAdapter.Callback {
         //recyclerView.setController(timelineEventController)
     }
 
-    override fun onEventsListChanged(oldList: List<EnrichedEvent>?, newList: List<EnrichedEvent>?) {
+    private fun renderRoomSummary(roomSummary: RoomSummary?) {
+        roomSummary?.let {
+            toolbar.title = it.displayName
+        }
+    }
+
+    private fun renderEvents(events: PagedList<EnrichedEvent>?) {
+        timelineAdapter.submitList(events)
+    }
+
+
+    override
+    fun onEventsListChanged(oldList: List<EnrichedEvent>?, newList: List<EnrichedEvent>?) {
         if (oldList == null && newList != null) {
             recyclerView.scrollToPosition(0)
         }
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListFragment.kt b/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListFragment.kt
index 103b7cdf..20c58e4d 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListFragment.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListFragment.kt
@@ -4,7 +4,11 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.airbnb.mvrx.*
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Incomplete
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
 import im.vector.matrix.android.api.failure.Failure
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.riotredesign.R
@@ -35,16 +39,19 @@ class RoomListFragment : RiotFragment(), RoomSummaryController.Callback {
         roomController = RoomSummaryController(this)
         stateView.contentView = epoxyRecyclerView
         epoxyRecyclerView.setController(roomController)
+
         viewModel.subscribe { renderState(it) }
     }
 
     private fun renderState(state: RoomListViewState) {
         when (state.roomSummaries) {
             is Incomplete -> renderLoading()
-            is Success -> renderSuccess(state.roomSummaries(), state.selectedRoom)
-            is Fail -> renderFailure(state.roomSummaries.error)
+            is Success    -> renderSuccess(state.roomSummaries(), state.selectedRoom)
+            is Fail       -> renderFailure(state.roomSummaries.error)
         }
-        if (state.showLastSelectedRoom && state.selectedRoom != null) {
+        if (state.selectedRoom != null && state.showLastSelectedRoom) {
+            val position = state.roomSummaries()?.indexOf(state.selectedRoom) ?: 0
+            epoxyRecyclerView.scrollToPosition(position)
             homeNavigator.openRoomDetail(state.selectedRoom.roomId)
         }
     }
@@ -65,7 +72,7 @@ class RoomListFragment : RiotFragment(), RoomSummaryController.Callback {
     private fun renderFailure(error: Throwable) {
         val message = when (error) {
             is Failure.NetworkConnection -> "Pas de connexion internet"
-            else -> "Une erreur est survenue"
+            else                         -> "Une erreur est survenue"
         }
         stateView.state = StateView.State.Error(message)
     }
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 0905e995..f7e6940b 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+
     <FrameLayout
         android:id="@+id/homeDrawerFragmentContainer"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_room_detail.xml b/app/src/main/res/layout/fragment_room_detail.xml
index 0ce705a9..9b4f1019 100644
--- a/app/src/main/res/layout/fragment_room_detail.xml
+++ b/app/src/main/res/layout/fragment_room_detail.xml
@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="0dp"
+        android:layout_height="?actionBarSize"
+        android:background="@color/dark"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
     <com.airbnb.epoxy.EpoxyRecyclerView
         android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        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/toolbar" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/themes_base.xml b/app/src/main/res/values-v21/themes_base.xml
new file mode 100644
index 00000000..41d96f4b
--- /dev/null
+++ b/app/src/main/res/values-v21/themes_base.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Base.V21.Theme.Riot" parent="Base.V1.Theme.Riot"></style>
+
+    <style name="Base.Theme.Riot" parent="Base.V21.Theme.Riot" />
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9d1a958e..8f3ff78e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-
-
     <color name="pale_grey">#f2f5f8</color>
     <color name="dark">#2e3649</color>
     <color name="pale_teal">#7ac9a1</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930d..25fe7ea9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,4 @@
 <resources>
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
 
 </resources>
diff --git a/app/src/main/res/values/styles_widget.xml b/app/src/main/res/values/styles_widget.xml
new file mode 100644
index 00000000..78554f9e
--- /dev/null
+++ b/app/src/main/res/values/styles_widget.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/text_appearances.xml b/app/src/main/res/values/text_appearances.xml
new file mode 100644
index 00000000..78554f9e
--- /dev/null
+++ b/app/src/main/res/values/text_appearances.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 00000000..f9f41d58
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.Riot" parent="Base.Theme.Riot">
+
+    </style>
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
new file mode 100644
index 00000000..4363f207
--- /dev/null
+++ b/app/src/main/res/values/themes_base.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Base.V1.Theme.Riot" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/dark</item>
+        <item name="colorPrimaryDark">@color/dark</item>
+        <item name="colorAccent">@color/pale_teal</item>
+    </style>
+
+    <style name="Base.Theme.Riot" parent="Base.V1.Theme.Riot" />
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes_overlay.xml b/app/src/main/res/values/themes_overlay.xml
new file mode 100644
index 00000000..a6b3daec
--- /dev/null
+++ b/app/src/main/res/values/themes_overlay.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes_overlay_base.xml b/app/src/main/res/values/themes_overlay_base.xml
new file mode 100644
index 00000000..a6b3daec
--- /dev/null
+++ b/app/src/main/res/values/themes_overlay_base.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt
index 26cb54b1..ac58a11b 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt
@@ -1,15 +1,18 @@
 package im.vector.matrix.android.api.session.room
 
+import android.arch.lifecycle.LiveData
 import im.vector.matrix.android.api.session.room.model.MyMembership
+import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.util.Cancelable
 
-interface Room: TimelineHolder {
+interface Room : TimelineHolder {
 
     val roomId: String
 
     val myMembership: MyMembership
 
-    fun getNumberOfJoinedMembers(): Int
+    val roomSummary: LiveData<RoomSummary>
 
     fun loadRoomMembersIfNeeded(): Cancelable
+
 }
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt
new file mode 100644
index 00000000..1962e06c
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomAvatarContent.kt
@@ -0,0 +1,9 @@
+package im.vector.matrix.android.api.session.room.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class RoomAvatarContent(
+        @Json(name = "url") val avatarUrl: String? = null
+)
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt
index 8898eade..477a391a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/RoomSummary.kt
@@ -2,6 +2,7 @@ package im.vector.matrix.android.api.session.room.model
 
 data class RoomSummary(
         val roomId: String,
-        var displayName: String = "",
-        var topic: String = ""
+        val displayName: String = "",
+        val topic: String = "",
+        val avatarUrl: String = ""
 )
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt
index 380744a0..989b074a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/RoomSummaryMapper.kt
@@ -10,7 +10,8 @@ object RoomSummaryMapper {
         return RoomSummary(
                 roomSummaryEntity.roomId,
                 roomSummaryEntity.displayName ?: "",
-                roomSummaryEntity.topic ?: ""
+                roomSummaryEntity.topic ?: "",
+                roomSummaryEntity.avatarUrl ?: ""
         )
     }
 
@@ -18,7 +19,8 @@ object RoomSummaryMapper {
         return RoomSummaryEntity(
                 roomSummary.roomId,
                 roomSummary.displayName,
-                roomSummary.topic
+                roomSummary.topic,
+                roomSummary.avatarUrl
         )
     }
 }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt
index 53a95c0c..74264fd7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/RoomSummaryEntity.kt
@@ -7,6 +7,7 @@ import io.realm.annotations.PrimaryKey
 // TODO to be completed
 open class RoomSummaryEntity(@PrimaryKey var roomId: String = "",
                              var displayName: String? = "",
+                             var avatarUrl: String? = "",
                              var topic: String? = "",
                              var lastMessage: EventEntity? = null,
                              var heroes: RealmList<String> = RealmList(),
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt
index 43b4b147..4c249ad0 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/EventEntityQueries.kt
@@ -1,8 +1,5 @@
 package im.vector.matrix.android.internal.database.query
 
-import im.vector.matrix.android.api.session.events.model.EventType
-import im.vector.matrix.android.api.session.room.model.RoomMember
-import im.vector.matrix.android.internal.database.mapper.asDomain
 import im.vector.matrix.android.internal.database.model.ChunkEntityFields
 import im.vector.matrix.android.internal.database.model.EventEntity
 import im.vector.matrix.android.internal.database.model.EventEntityFields
@@ -45,13 +42,3 @@ fun RealmQuery<EventEntity>.last(from: Long? = null): EventEntity? {
 fun RealmList<EventEntity>.fastContains(eventEntity: EventEntity): Boolean {
     return this.where().equalTo(EventEntityFields.EVENT_ID, eventEntity.eventId).findFirst() != null
 }
-
-fun EventEntity.Companion.findAllRoomMembers(realm: Realm, roomId: String): Map<String, RoomMember> {
-    return EventEntity
-            .where(realm, roomId, EventType.STATE_ROOM_MEMBER)
-            .sort(EventEntityFields.ORIGIN_SERVER_TS)
-            .findAll()
-            .map { it.asDomain() }
-            .associateBy { it.stateKey!! }
-            .mapValues { it.value.content<RoomMember>()!! }
-}
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
index 490f9e54..974efa90 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
@@ -4,9 +4,10 @@ import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.session.room.RoomService
 import im.vector.matrix.android.internal.auth.data.SessionParams
 import im.vector.matrix.android.internal.session.room.DefaultRoomService
+import im.vector.matrix.android.internal.session.room.RoomAvatarResolver
+import im.vector.matrix.android.internal.session.room.RoomSummaryUpdater
 import im.vector.matrix.android.internal.session.room.members.RoomDisplayNameResolver
 import im.vector.matrix.android.internal.session.room.members.RoomMemberDisplayNameResolver
-import im.vector.matrix.android.internal.session.room.RoomSummaryUpdater
 import io.realm.RealmConfiguration
 import org.koin.dsl.context.ModuleDefinition
 import org.koin.dsl.module.Module
@@ -37,11 +38,15 @@ class SessionModule(private val sessionParams: SessionParams) : Module {
         }
 
         scope(DefaultSession.SCOPE) {
-            RoomDisplayNameResolver(get(), get(), sessionParams)
+            RoomDisplayNameResolver(get(), get(), sessionParams.credentials)
         }
 
         scope(DefaultSession.SCOPE) {
-            RoomSummaryUpdater(get(), get(), get())
+            RoomAvatarResolver(get(), sessionParams.credentials)
+        }
+
+        scope(DefaultSession.SCOPE) {
+            RoomSummaryUpdater(get(), get(), get(), get())
         }
 
         scope(DefaultSession.SCOPE) {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt
index 284e066c..97d860ad 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt
@@ -1,6 +1,7 @@
 package im.vector.matrix.android.internal.session.room
 
 import android.arch.lifecycle.LiveData
+import android.arch.lifecycle.Transformations
 import android.arch.paging.PagedList
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.MatrixCallback
@@ -9,7 +10,9 @@ import im.vector.matrix.android.api.session.room.Room
 import im.vector.matrix.android.api.session.room.TimelineHolder
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.MyMembership
+import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.android.api.util.Cancelable
+import im.vector.matrix.android.internal.database.mapper.asDomain
 import im.vector.matrix.android.internal.database.model.RoomEntity
 import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
 import im.vector.matrix.android.internal.database.query.where
@@ -24,18 +27,25 @@ data class DefaultRoom(
         override val myMembership: MyMembership
 ) : Room, KoinComponent {
 
+
     private val loadRoomMembersRequest by inject<LoadRoomMembersRequest>()
     private val syncTokenStore by inject<SyncTokenStore>()
     private val monarchy by inject<Monarchy>()
     private val timelineHolder by inject<TimelineHolder>(parameters = { parametersOf(roomId) })
 
-    override fun liveTimeline(): LiveData<PagedList<EnrichedEvent>> {
-        return timelineHolder.liveTimeline()
+    override val roomSummary: LiveData<RoomSummary> by lazy {
+        val liveData = monarchy
+                .findAllMappedWithChanges(
+                        { realm -> RoomSummaryEntity.where(realm, roomId) },
+                        { from -> from.asDomain() })
+
+        Transformations.map(liveData) {
+            it.first()
+        }
     }
 
-    override fun getNumberOfJoinedMembers(): Int {
-        val roomSummary = monarchy.fetchAllCopiedSync { realm -> RoomSummaryEntity.where(realm, roomId) }.firstOrNull()
-        return roomSummary?.joinedMembersCount ?: 0
+    override fun liveTimeline(): LiveData<PagedList<EnrichedEvent>> {
+        return timelineHolder.liveTimeline()
     }
 
     override fun loadRoomMembersIfNeeded(): Cancelable {
@@ -47,7 +57,6 @@ data class DefaultRoom(
         }
     }
 
-
     private fun areAllMembersLoaded(): Boolean {
         return monarchy
                        .fetchAllCopiedSync { RoomEntity.where(it, roomId) }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt
new file mode 100644
index 00000000..df38bc42
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomAvatarResolver.kt
@@ -0,0 +1,53 @@
+package im.vector.matrix.android.internal.session.room
+
+import com.zhuinden.monarchy.Monarchy
+import im.vector.matrix.android.api.session.events.model.EventType
+import im.vector.matrix.android.api.session.room.Room
+import im.vector.matrix.android.api.session.room.model.MyMembership
+import im.vector.matrix.android.api.session.room.model.RoomAvatarContent
+import im.vector.matrix.android.internal.auth.data.Credentials
+import im.vector.matrix.android.internal.database.mapper.asDomain
+import im.vector.matrix.android.internal.database.model.EventEntity
+import im.vector.matrix.android.internal.database.query.last
+import im.vector.matrix.android.internal.database.query.where
+import im.vector.matrix.android.internal.session.room.members.RoomMembers
+
+internal class RoomAvatarResolver(private val monarchy: Monarchy,
+                                  private val credentials: Credentials) {
+
+    /**
+     * Compute the room avatar url
+     *
+     * @return the room avatar url, can be a fallback to a room member avatar or null
+     */
+    fun resolve(room: Room): String? {
+        var res: String? = null
+        monarchy.doWithRealm { realm ->
+            val roomName = EventEntity.where(realm, room.roomId, EventType.STATE_ROOM_AVATAR).last()?.asDomain()
+            res = roomName?.content<RoomAvatarContent>()?.avatarUrl
+            if (!res.isNullOrEmpty()) {
+                return@doWithRealm
+            }
+            val roomMembers = RoomMembers(realm, room.roomId)
+            val members = roomMembers.getLoaded()
+            if (room.myMembership == MyMembership.INVITED) {
+                if (members.size == 1) {
+                    res = members.entries.first().value.avatarUrl
+                } else if (members.size > 1) {
+                    val firstOtherMember = members.filterKeys { it != credentials.userId }.values.firstOrNull()
+                    res = firstOtherMember?.avatarUrl
+                }
+            } else {
+                // detect if it is a room with no more than 2 members (i.e. an alone or a 1:1 chat)
+                if (roomMembers.getNumberOfJoinedMembers() == 1 && members.isNotEmpty()) {
+                    res = members.entries.first().value.avatarUrl
+                } else if (roomMembers.getNumberOfMembers() == 2 && members.size > 1) {
+                    val firstOtherMember = members.filterKeys { it != credentials.userId }.values.firstOrNull()
+                    res = firstOtherMember?.avatarUrl
+                }
+            }
+
+        }
+        return res
+    }
+}
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomSummaryUpdater.kt
index 254e7ec7..a1f5e31d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomSummaryUpdater.kt
@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 
 internal class RoomSummaryUpdater(private val monarchy: Monarchy,
                                   private val roomDisplayNameResolver: RoomDisplayNameResolver,
+                                  private val roomAvatarResolver: RoomAvatarResolver,
                                   private val context: Context
 ) : Observer<Monarchy.ManagedChangeSet<RoomEntity>> {
 
@@ -47,23 +48,23 @@ internal class RoomSummaryUpdater(private val monarchy: Monarchy,
         val rooms = changeSet.realmResults.map { it.asDomain() }
         val indexesToUpdate = changeSet.orderedCollectionChangeSet.changes + changeSet.orderedCollectionChangeSet.insertions
         monarchy.writeAsync { realm ->
-            insertRoomList(realm, rooms, indexesToUpdate)
+            updateRoomList(realm, rooms, indexesToUpdate)
         }
     }
 
 
-    private fun insertRoomList(realm: Realm, rooms: List<Room>, indexes: IntArray) {
+    private fun updateRoomList(realm: Realm, rooms: List<Room>, indexes: IntArray) {
         indexes.forEach {
             val room = rooms[it]
             try {
-                insertRoom(realm, room)
+                updateRoom(realm, room)
             } catch (e: Exception) {
                 Timber.e(e, "An error occured when updating room summaries")
             }
         }
     }
 
-    private fun insertRoom(realm: Realm, room: Room?) {
+    private fun updateRoom(realm: Realm, room: Room?) {
         if (room == null) {
             return
         }
@@ -74,6 +75,7 @@ internal class RoomSummaryUpdater(private val monarchy: Monarchy,
         val lastTopicEvent = EventEntity.where(realm, room.roomId, EventType.STATE_ROOM_TOPIC).last()?.asDomain()
 
         roomSummary.displayName = roomDisplayNameResolver.resolve(context, room).toString()
+        roomSummary.avatarUrl = roomAvatarResolver.resolve(room)
         roomSummary.topic = lastTopicEvent?.content<RoomTopicContent>()?.topic
         roomSummary.lastMessage = lastMessageEvent
     }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/LoadRoomMembersRequest.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/LoadRoomMembersRequest.kt
index 4080a41f..0a84c25c 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/LoadRoomMembersRequest.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/LoadRoomMembersRequest.kt
@@ -8,9 +8,7 @@ import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.failure.Failure
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.util.Cancelable
-import im.vector.matrix.android.internal.database.model.EventEntity
 import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.query.findAllRoomMembers
 import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.network.executeRequest
 import im.vector.matrix.android.internal.session.room.RoomAPI
@@ -63,7 +61,7 @@ internal class LoadRoomMembersRequest(private val roomAPI: RoomAPI,
             val roomEntity = RoomEntity.where(realm, roomId).findFirst()
                              ?: throw IllegalStateException("You shouldn't use this method without a room")
 
-            val roomMembers = EventEntity.findAllRoomMembers(realm, roomId)
+            val roomMembers = RoomMembers(realm, roomId).getLoaded()
             val eventsToInsert = response.roomMemberEvents.filter { !roomMembers.containsKey(it.stateKey) }
 
             val chunk = stateEventsChunkHandler.handle(realm, roomId, eventsToInsert)
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomDisplayNameResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomDisplayNameResolver.kt
index 8a1ec1ca..9106aca7 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomDisplayNameResolver.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomDisplayNameResolver.kt
@@ -25,20 +25,19 @@ import im.vector.matrix.android.api.session.room.model.MyMembership
 import im.vector.matrix.android.api.session.room.model.RoomAliasesContent
 import im.vector.matrix.android.api.session.room.model.RoomCanonicalAliasContent
 import im.vector.matrix.android.api.session.room.model.RoomNameContent
-import im.vector.matrix.android.internal.auth.data.SessionParams
+import im.vector.matrix.android.internal.auth.data.Credentials
 import im.vector.matrix.android.internal.database.mapper.asDomain
 import im.vector.matrix.android.internal.database.model.EventEntity
 import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
-import im.vector.matrix.android.internal.database.query.findAllRoomMembers
 import im.vector.matrix.android.internal.database.query.last
 import im.vector.matrix.android.internal.database.query.where
 
 /**
  * This class computes room display name
  */
-class RoomDisplayNameResolver(private val monarchy: Monarchy,
-                              private val roomMemberDisplayNameResolver: RoomMemberDisplayNameResolver,
-                              private val sessionParams: SessionParams
+internal class RoomDisplayNameResolver(private val monarchy: Monarchy,
+                                       private val roomMemberDisplayNameResolver: RoomMemberDisplayNameResolver,
+                                       private val credentials: Credentials
 ) {
 
     /**
@@ -75,9 +74,9 @@ class RoomDisplayNameResolver(private val monarchy: Monarchy,
                 return@doWithRealm
             }
 
-            val otherRoomMembers = EventEntity
-                    .findAllRoomMembers(realm, room.roomId)
-                    .filterKeys { it != sessionParams.credentials.userId }
+            val roomMembers = RoomMembers(realm, room.roomId)
+            val otherRoomMembers = roomMembers.getLoaded()
+                    .filterKeys { it != credentials.userId }
 
             if (room.myMembership == MyMembership.INVITED) {
                 //TODO handle invited
@@ -117,9 +116,9 @@ class RoomDisplayNameResolver(private val monarchy: Monarchy,
                     else -> {
                         val member = memberIds[0]
                         name = context.resources.getQuantityString(R.plurals.room_displayname_three_and_more_members,
-                                                                   room.getNumberOfJoinedMembers() - 1,
+                                                                   roomMembers.getNumberOfJoinedMembers() - 1,
                                                                    roomMemberDisplayNameResolver.resolve(member, otherRoomMembers),
-                                                                   room.getNumberOfJoinedMembers() - 1)
+                                                                   roomMembers.getNumberOfJoinedMembers() - 1)
                     }
                 }
             }
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMembers.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMembers.kt
new file mode 100644
index 00000000..5e2c52cd
--- /dev/null
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/members/RoomMembers.kt
@@ -0,0 +1,47 @@
+package im.vector.matrix.android.internal.session.room.members
+
+import im.vector.matrix.android.api.session.events.model.EventType
+import im.vector.matrix.android.api.session.room.model.Membership
+import im.vector.matrix.android.api.session.room.model.RoomMember
+import im.vector.matrix.android.internal.database.mapper.asDomain
+import im.vector.matrix.android.internal.database.model.EventEntity
+import im.vector.matrix.android.internal.database.model.EventEntityFields
+import im.vector.matrix.android.internal.database.model.RoomSummaryEntity
+import im.vector.matrix.android.internal.database.query.where
+import io.realm.Realm
+
+internal class RoomMembers(private val realm: Realm,
+                           private val roomId: String
+) {
+
+    private val roomSummary: RoomSummaryEntity? by lazy {
+        RoomSummaryEntity.where(realm, roomId).findFirst()
+    }
+
+    fun getLoaded(): Map<String, RoomMember> {
+        return EventEntity
+                .where(realm, roomId, EventType.STATE_ROOM_MEMBER)
+                .sort(EventEntityFields.ORIGIN_SERVER_TS)
+                .findAll()
+                .map { it.asDomain() }
+                .associateBy { it.stateKey!! }
+                .mapValues { it.value.content<RoomMember>()!! }
+    }
+
+
+    fun getNumberOfJoinedMembers(): Int {
+        return roomSummary?.joinedMembersCount
+               ?: getLoaded().filterValues { it.membership == Membership.JOIN }.size
+    }
+
+    fun getNumberOfInvitedMembers(): Int {
+        return roomSummary?.invitedMembersCount
+               ?: getLoaded().filterValues { it.membership == Membership.INVITE }.size
+    }
+
+    fun getNumberOfMembers(): Int {
+        return getNumberOfJoinedMembers() + getNumberOfInvitedMembers()
+    }
+
+
+}
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt
index 003fc721..b6fcde04 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/sync/RoomSyncHandler.kt
@@ -63,9 +63,6 @@ internal class RoomSyncHandler(private val monarchy: Monarchy,
 
         roomEntity.membership = MyMembership.JOINED
 
-        if (roomSync.summary != null) {
-            handleRoomSummary(realm, roomId, roomSync.summary)
-        }
         if (roomSync.state != null && roomSync.state.events.isNotEmpty()) {
             val chunkEntity = stateEventsChunkHandler.handle(realm, roomId, roomSync.state.events)
             if (!roomEntity.chunks.contains(chunkEntity)) {
@@ -78,6 +75,9 @@ internal class RoomSyncHandler(private val monarchy: Monarchy,
                 roomEntity.chunks.add(chunkEntity)
             }
         }
+        if (roomSync.summary != null) {
+            handleRoomSummary(realm, roomId, roomSync.summary)
+        }
         return roomEntity
     }