diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationTopAppBar.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationTopAppBar.kt index 17a6de924d2..9c6fa0126b7 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationTopAppBar.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationTopAppBar.kt @@ -24,6 +24,7 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -31,8 +32,8 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.SmallTopAppBar import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -47,8 +48,8 @@ import com.wire.android.R import com.wire.android.model.UserAvatarData import com.wire.android.ui.calling.controlbuttons.JoinButton import com.wire.android.ui.calling.controlbuttons.StartCallButton -import com.wire.android.ui.common.UserProfileAvatar import com.wire.android.ui.common.ConversationVerificationIcons +import com.wire.android.ui.common.UserProfileAvatar import com.wire.android.ui.common.button.WireSecondaryIconButton import com.wire.android.ui.common.colorsScheme import com.wire.android.ui.common.conversationColor @@ -112,11 +113,12 @@ private fun ConversationScreenTopAppBarContent( isInteractionEnabled: Boolean, isSearchEnabled: Boolean, ) { - SmallTopAppBar( + TopAppBar( title = { Row( verticalAlignment = Alignment.CenterVertically, modifier = Modifier + .fillMaxWidth() // TopAppBar adds TopAppBarHorizontalPadding = 4.dp to each element, so we need to offset it to retain the desired // spacing between navigation icon button and avatar according to the designs .offset(x = -dimensions().spacing4x)