From 09fa6493b38752cc7e1e63f5c131b9bff706b72f Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Tue, 8 Nov 2022 11:08:02 +0100
Subject: [PATCH] Messages: refine a bit toolbar

---
 .../java/io/element/android/x/Navigation.kt   | 12 +++---
 .../x/features/messages/MessagesScreen.kt     | 42 +++++++++++++++----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/io/element/android/x/Navigation.kt b/app/src/main/java/io/element/android/x/Navigation.kt
index 1006c4ab75..cba9804824 100644
--- a/app/src/main/java/io/element/android/x/Navigation.kt
+++ b/app/src/main/java/io/element/android/x/Navigation.kt
@@ -18,8 +18,8 @@ import io.element.android.x.matrix.core.RoomId
 fun LoginScreenNavigation(navigator: DestinationsNavigator) {
     LoginScreen(
         onLoginWithSuccess = {
-            navigator.navigate(RoomListScreenNavigationDestination){
-                popUpTo(LoginScreenNavigationDestination){
+            navigator.navigate(RoomListScreenNavigationDestination) {
+                popUpTo(LoginScreenNavigationDestination) {
                     inclusive = true
                 }
             }
@@ -36,8 +36,8 @@ fun RoomListScreenNavigation(navigator: DestinationsNavigator) {
             navigator.navigate(MessagesScreenNavigationDestination(roomId = roomId.value))
         },
         onSuccessLogout = {
-            navigator.navigate(LoginScreenNavigationDestination){
-                popUpTo(RoomListScreenNavigationDestination){
+            navigator.navigate(LoginScreenNavigationDestination) {
+                popUpTo(RoomListScreenNavigationDestination) {
                     inclusive = true
                 }
             }
@@ -46,8 +46,8 @@ fun RoomListScreenNavigation(navigator: DestinationsNavigator) {
 
 @Destination
 @Composable
-fun MessagesScreenNavigation(roomId: String) {
-    MessagesScreen(roomId)
+fun MessagesScreenNavigation(roomId: String, navigator: DestinationsNavigator) {
+    MessagesScreen(roomId, navigator::navigateUp)
 }
 
 
diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
index efcd0bd6e0..71c544b17d 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
@@ -3,7 +3,6 @@
 package io.element.android.x.features.messages
 
 import Avatar
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
@@ -12,6 +11,8 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
@@ -20,9 +21,11 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.LastBaseline
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.airbnb.mvrx.compose.collectAsState
 import com.airbnb.mvrx.compose.mavericksViewModel
 import io.element.android.x.core.data.LogCompositions
@@ -32,7 +35,10 @@ import io.element.android.x.features.messages.model.MessagesTimelineItemState
 import io.element.android.x.features.messages.model.MessagesViewState
 
 @Composable
-fun MessagesScreen(roomId: String) {
+fun MessagesScreen(
+    roomId: String,
+    onBackPressed: () -> Unit
+) {
     val viewModel: MessagesViewModel = mavericksViewModel(argsFactory = { roomId })
     LogCompositions(tag = "MessagesScreen", msg = "Root")
     val roomTitle by viewModel.collectAsState(MessagesViewState::roomName)
@@ -44,7 +50,8 @@ fun MessagesScreen(roomId: String) {
         roomAvatar = roomAvatar,
         timelineItems = timelineItems().orEmpty(),
         hasMoreToLoad = hasMoreToLoad,
-        onReachedLoadMore = viewModel::loadMore
+        onReachedLoadMore = viewModel::loadMore,
+        onBackPressed = onBackPressed
     )
 }
 
@@ -55,6 +62,7 @@ fun MessagesContent(
     timelineItems: List<MessagesTimelineItemState>,
     hasMoreToLoad: Boolean,
     onReachedLoadMore: () -> Unit,
+    onBackPressed: () -> Unit
 ) {
     LogCompositions(tag = "MessagesScreen", msg = "Content")
     val lazyListState = rememberLazyListState()
@@ -62,13 +70,29 @@ fun MessagesContent(
         topBar = {
             TopAppBar(
                 navigationIcon = {
-                    if (roomAvatar != null) {
-                        IconButton(onClick = {}) {
-                            Avatar(roomAvatar)
-                        }
+                    IconButton(onClick = onBackPressed) {
+                        Icon(
+                            imageVector = Icons.Filled.ArrowBack,
+                            contentDescription = "Back"
+                        )
                     }
                 },
-                title = { Text(text = roomTitle ?: "") }
+                title = {
+                    Row(verticalAlignment = Alignment.CenterVertically) {
+                        if (roomAvatar != null) {
+                            Avatar(roomAvatar)
+                            Spacer(modifier = Modifier.width(8.dp))
+                        }
+                        Text(
+                            fontSize = 16.sp,
+                            fontWeight = FontWeight.SemiBold,
+                            text = roomTitle ?: "Unknown room",
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis
+                        )
+                    }
+                }
+
             )
         },
         content = { padding ->