Moves navigation's top bar to use the ArrowBack

app/src/main/java/com/vitorpamplona/amethyst/ui/components/SelectTextDialog.kt

@@ -48,7 +48,7 @@ fun SelectTextDialog(text: String, onDismiss: () -> Unit) {
                     IconButton(
                         onClick = onDismiss
                     ) {
-                        ArrowBackIcon(Size24dp)
+                        ArrowBackIcon()
                     }
                     Text(text = stringResource(R.string.select_text_dialog_top))
                 }

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AccountSwitchBottomSheet.kt

@@ -21,7 +21,6 @@ import androidx.compose.material.Text
 import androidx.compose.material.TextButton
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Logout
 import androidx.compose.material.icons.filled.RadioButtonChecked
 import androidx.compose.runtime.Composable
@@ -52,6 +51,7 @@ import com.vitorpamplona.amethyst.model.toHexKey
 import com.vitorpamplona.amethyst.ui.actions.toImmutableListOfLists
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
+import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.amethyst.ui.screen.AccountStateViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
@@ -108,11 +108,7 @@ fun AccountSwitchBottomSheet(
                         title = { Text(text = stringResource(R.string.account_switch_add_account_dialog_title)) },
                         navigationIcon = {
                             IconButton(onClick = { popupExpanded = false }) {
-                                Icon(
+                                ArrowBackIcon()
-                                    imageVector = Icons.Default.ArrowBack,
-                                    contentDescription = stringResource(R.string.back),
-                                    tint = MaterialTheme.colors.onSurface
-                                )
                             }
                         },
                         backgroundColor = Color.Transparent,

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt

@@ -8,22 +8,29 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.AppBarDefaults
+import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Divider
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.MaterialTheme
+import androidx.compose.material.ProvideTextStyle
 import androidx.compose.material.ScaffoldState
+import androidx.compose.material.Surface
 import androidx.compose.material.Text
-import androidx.compose.material.TopAppBar
+import androidx.compose.material.contentColorFor
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.ExpandMore
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
@@ -39,8 +46,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
@@ -49,8 +57,10 @@ import androidx.navigation.NavBackStackEntry
 import coil.Coil
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.ChatroomKey
 import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.KIND3_FOLLOWS
+import com.vitorpamplona.amethyst.model.LiveActivitiesChannel
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.service.NostrChannelDataSource
@@ -73,22 +83,37 @@ import com.vitorpamplona.amethyst.service.model.PeopleListEvent
 import com.vitorpamplona.amethyst.service.relays.Client
 import com.vitorpamplona.amethyst.service.relays.RelayPool
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImageProxy
-import com.vitorpamplona.amethyst.ui.note.CommunityHeader
+import com.vitorpamplona.amethyst.ui.note.AmethystIcon
+import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
+import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.LoadAddressableNote
 import com.vitorpamplona.amethyst.ui.note.LoadChannel
+import com.vitorpamplona.amethyst.ui.note.LoadUser
+import com.vitorpamplona.amethyst.ui.note.LongCommunityHeader
+import com.vitorpamplona.amethyst.ui.note.NonClickableUserPictures
 import com.vitorpamplona.amethyst.ui.note.SearchIcon
+import com.vitorpamplona.amethyst.ui.note.ShortCommunityHeader
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.equalImmutableLists
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChannelHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.DislayGeoTagHeader
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.ChatroomHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.GeoHashActionOptions
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.GeoHashHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.HashtagActionOptions
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.HashtagHeader
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.LoadRoom
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.LoadRoomByAuthor
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.LongChannelHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.LongRoomHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.RoomNameOnlyDisplay
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.ShortChannelHeader
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.ShowVideoStreaming
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
 import com.vitorpamplona.amethyst.ui.theme.BottomTopHeight
+import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.HeaderPictureModifier
+import com.vitorpamplona.amethyst.ui.theme.Size10dp
 import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
+import com.vitorpamplona.amethyst.ui.theme.Size34dp
+import com.vitorpamplona.amethyst.ui.theme.Size40dp
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -143,56 +168,12 @@ private fun RenderTopRouteBar(
         else -> {
             if (id != null) {
                 when (currentRoute) {
-                    Route.Channel.base -> LoadChannel(baseChannelHex = id) {
+                    Route.Channel.base -> ChannelTopBar(id, accountViewModel, nav, navPopBack)
-                        ChannelHeader(
+                    Route.RoomByAuthor.base -> RoomByAuthorTopBar(id, accountViewModel, nav, navPopBack)
-                            baseChannel = it,
+                    Route.Room.base -> RoomTopBar(id, accountViewModel, nav, navPopBack)
-                            showVideo = true,
+                    Route.Community.base -> CommunityTopBar(id, accountViewModel, nav, navPopBack)
-                            showBottomDiviser = true,
+                    Route.Hashtag.base -> HashTagTopBar(id, accountViewModel, navPopBack)
-                            modifier = Modifier.padding(vertical = 8.dp, horizontal = 11.dp),
+                    Route.Geohash.base -> GeoHashTopBar(id, accountViewModel, navPopBack)
-                            accountViewModel = accountViewModel,
-                            nav = nav
-                        )
-                    }
-                    Route.RoomByAuthor.base -> LoadRoomByAuthor(authorPubKeyHex = id, accountViewModel) {
-                        if (it != null) {
-                            ChatroomHeader(
-                                room = it,
-                                modifier = Modifier.padding(vertical = 4.dp, horizontal = 11.dp),
-                                accountViewModel = accountViewModel,
-                                nav = nav
-                            )
-                        } else {
-                            Spacer(BottomTopHeight)
-                        }
-                    }
-                    Route.Room.base -> LoadRoom(roomId = id, accountViewModel) {
-                        if (it != null) {
-                            ChatroomHeader(
-                                room = it,
-                                modifier = Modifier.padding(vertical = 4.dp, horizontal = 11.dp),
-                                accountViewModel = accountViewModel,
-                                nav = nav
-                            )
-                        } else {
-                            Spacer(BottomTopHeight)
-                        }
-                    }
-                    Route.Community.base -> LoadAddressableNote(aTagHex = id) {
-                        if (it != null) {
-                            CommunityHeader(
-                                baseNote = it,
-                                showBottomDiviser = true,
-                                sendToCommunity = false,
-                                modifier = Modifier.padding(vertical = 8.dp, horizontal = 10.dp),
-                                accountViewModel = accountViewModel,
-                                nav = nav
-                            )
-                        } else {
-                            Spacer(BottomTopHeight)
-                        }
-                    }
-                    Route.Hashtag.base -> HashtagHeader(id, Modifier.padding(vertical = 0.dp, horizontal = 10.dp), accountViewModel)
-                    Route.Geohash.base -> GeoHashHeader(id, Modifier.padding(vertical = 0.dp, horizontal = 10.dp), accountViewModel)
                     else -> MainTopBar(scaffoldState, accountViewModel, nav)
                 }
             } else {
@@ -202,13 +183,180 @@ private fun RenderTopRouteBar(
     }
 }
 
+@Composable
+private fun GeoHashTopBar(
+    tag: String,
+    accountViewModel: AccountViewModel,
+    navPopBack: () -> Unit
+) {
+    FlexibleTopBarWithBackButton(
+        title = {
+            DislayGeoTagHeader(tag, remember { Modifier.weight(1f) })
+            GeoHashActionOptions(tag, accountViewModel)
+        },
+        popBack = navPopBack
+    )
+}
+
+@Composable
+private fun HashTagTopBar(
+    tag: String,
+    accountViewModel: AccountViewModel,
+    navPopBack: () -> Unit
+) {
+    FlexibleTopBarWithBackButton(
+        title = {
+            Text(
+                remember(tag) { "#$tag" },
+                fontWeight = FontWeight.Bold,
+                modifier = Modifier.weight(1f)
+            )
+
+            HashtagActionOptions(tag, accountViewModel)
+        },
+        popBack = navPopBack
+    )
+}
+
+@Composable
+private fun CommunityTopBar(
+    id: String,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    navPopBack: () -> Unit
+) {
+    LoadAddressableNote(aTagHex = id) { baseNote ->
+        if (baseNote != null) {
+            FlexibleTopBarWithBackButton(
+                title = {
+                    ShortCommunityHeader(baseNote, fontWeight = FontWeight.Medium, accountViewModel, nav)
+                },
+                extendableRow = {
+                    LongCommunityHeader(baseNote, accountViewModel, nav)
+                },
+                popBack = navPopBack
+            )
+        } else {
+            Spacer(BottomTopHeight)
+        }
+    }
+}
+
+@Composable
+private fun RoomTopBar(
+    id: String,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    navPopBack: () -> Unit
+) {
+    LoadRoom(roomId = id, accountViewModel) { room ->
+        if (room != null) {
+            RenderRoomTopBar(room, accountViewModel, nav, navPopBack)
+        } else {
+            Spacer(BottomTopHeight)
+        }
+    }
+}
+
+@Composable
+private fun RoomByAuthorTopBar(
+    id: String,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    navPopBack: () -> Unit
+) {
+    LoadRoomByAuthor(authorPubKeyHex = id, accountViewModel) { room ->
+        if (room != null) {
+            RenderRoomTopBar(room, accountViewModel, nav, navPopBack)
+        } else {
+            Spacer(BottomTopHeight)
+        }
+    }
+}
+
+@Composable
+private fun RenderRoomTopBar(
+    room: ChatroomKey,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    navPopBack: () -> Unit
+) {
+    if (room.users.size == 1) {
+        FlexibleTopBarWithBackButton(
+            title = {
+                LoadUser(baseUserHex = room.users.first()) { baseUser ->
+                    if (baseUser != null) {
+                        ClickableUserPicture(
+                            baseUser = baseUser,
+                            accountViewModel = accountViewModel,
+                            size = Size34dp
+                        )
+
+                        Spacer(modifier = DoubleHorzSpacer)
+
+                        UsernameDisplay(baseUser, Modifier.weight(1f), fontWeight = FontWeight.Medium)
+                    }
+                }
+            },
+            popBack = navPopBack
+        )
+    } else {
+        FlexibleTopBarWithBackButton(
+            title = {
+                NonClickableUserPictures(
+                    users = room.users,
+                    accountViewModel = accountViewModel,
+                    size = Size34dp
+                )
+
+                RoomNameOnlyDisplay(room, Modifier.padding(start = 10.dp).weight(1f), fontWeight = FontWeight.Medium, accountViewModel.userProfile())
+            },
+            extendableRow = {
+                LongRoomHeader(room, accountViewModel, nav)
+            },
+            popBack = navPopBack
+        )
+    }
+}
+
+@Composable
+private fun ChannelTopBar(
+    id: String,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    navPopBack: () -> Unit
+) {
+    LoadChannel(baseChannelHex = id) { baseChannel ->
+        FlexibleTopBarWithBackButton(
+            prefixRow = {
+                if (baseChannel is LiveActivitiesChannel) {
+                    ShowVideoStreaming(baseChannel, accountViewModel)
+                }
+            },
+            title = {
+                ShortChannelHeader(
+                    baseChannel = baseChannel,
+                    accountViewModel = accountViewModel,
+                    fontWeight = FontWeight.Medium,
+                    nav = nav,
+                    showFlag = true
+                )
+            },
+            extendableRow = {
+                LongChannelHeader(baseChannel, accountViewModel, nav)
+            },
+            popBack = navPopBack
+        )
+    }
+}
+
 @Composable
 fun NoTopBar() {
 }
 
 @Composable
 fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
+    GenericMainTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
         val list by accountViewModel.storiesListLiveData.observeAsState(GLOBAL_FOLLOWS)
 
         FollowList(
@@ -223,7 +371,7 @@ fun StoriesTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState
 
 @Composable
 fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
+    GenericMainTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
         val list by accountViewModel.homeListLiveData.observeAsState(KIND3_FOLLOWS)
 
         FollowList(
@@ -238,7 +386,7 @@ fun HomeTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, a
 
 @Composable
 fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
+    GenericMainTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
         val list by accountViewModel.notificationListLiveData.observeAsState(GLOBAL_FOLLOWS)
 
         FollowList(
@@ -253,7 +401,7 @@ fun NotificationTopBar(followLists: FollowListViewModel, scaffoldState: Scaffold
 
 @Composable
 fun DiscoveryTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    GenericTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
+    GenericMainTopBar(scaffoldState, accountViewModel, nav) { accountViewModel ->
         val list by accountViewModel.discoveryListLiveData.observeAsState(GLOBAL_FOLLOWS)
 
         FollowList(
@@ -268,18 +416,23 @@ fun DiscoveryTopBar(followLists: FollowListViewModel, scaffoldState: ScaffoldSta
 
 @Composable
 fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
-    GenericTopBar(scaffoldState, accountViewModel, nav) {
+    GenericMainTopBar(scaffoldState, accountViewModel, nav) {
-        AmethystIcon()
+        AmethystClickableIcon()
     }
 }
 
 @OptIn(coil.annotation.ExperimentalCoilApi::class)
 @Composable
-fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel, nav: (String) -> Unit, content: @Composable (AccountViewModel) -> Unit) {
+fun GenericMainTopBar(
+    scaffoldState: ScaffoldState,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    content: @Composable (AccountViewModel) -> Unit
+) {
     val coroutineScope = rememberCoroutineScope()
 
     Column(modifier = BottomTopHeight) {
-        TopAppBar(
+        MyTopAppBar(
             elevation = 0.dp,
             backgroundColor = MaterialTheme.colors.surface,
             title = {
@@ -291,8 +444,7 @@ fun GenericTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod
                         Column(
                             modifier = Modifier
                                 .fillMaxWidth()
-                                .fillMaxHeight()
+                                .fillMaxHeight(),
-                                .padding(start = 0.dp, end = 20.dp),
                             horizontalAlignment = Alignment.CenterHorizontally,
                             verticalArrangement = Arrangement.Center
                         ) {
@@ -489,23 +641,16 @@ fun SimpleTextSpinner(
 
 @Composable
 fun TopBarWithBackButton(caption: String, popBack: () -> Unit) {
-    Column() {
+    Column(modifier = BottomTopHeight) {
-        TopAppBar(
+        MyTopAppBar(
             elevation = 0.dp,
-            backgroundColor = Color(0xFFFFFF),
+            title = { Text(caption) },
-            title = {
-                Text(caption)
-            },
             navigationIcon = {
                 IconButton(
                     onClick = popBack,
                     modifier = Modifier
                 ) {
-                    Icon(
+                    ArrowBackIcon()
-                        imageVector = Icons.Default.ArrowBack,
-                        contentDescription = stringResource(R.string.back),
-                        tint = MaterialTheme.colors.onSurface
-                    )
                 }
             },
             actions = {}
@@ -515,7 +660,34 @@ fun TopBarWithBackButton(caption: String, popBack: () -> Unit) {
 }
 
 @Composable
-fun AmethystIcon() {
+fun FlexibleTopBarWithBackButton(
+    prefixRow: (@Composable () -> Unit)? = null,
+    title: @Composable RowScope.() -> Unit,
+    extendableRow: (@Composable () -> Unit)? = null,
+    popBack: () -> Unit
+) {
+    Column() {
+        MyExtensibleTopAppBar(
+            elevation = 0.dp,
+            prefixRow = prefixRow,
+            title = title,
+            extendableRow = extendableRow,
+            navigationIcon = {
+                IconButton(
+                    onClick = popBack,
+                    modifier = Modifier
+                ) {
+                    ArrowBackIcon()
+                }
+            },
+            actions = {}
+        )
+        Divider(thickness = 0.25.dp)
+    }
+}
+
+@Composable
+fun AmethystClickableIcon() {
     val context = LocalContext.current
 
     IconButton(
@@ -523,12 +695,7 @@ fun AmethystIcon() {
             debugState(context)
         }
     ) {
-        Icon(
+        AmethystIcon(Size40dp)
-            painter = painterResource(R.drawable.amethyst),
-            null,
-            modifier = Modifier.size(40.dp),
-            tint = Color.Unspecified
-        )
     }
 }
 
@@ -578,3 +745,151 @@ fun debugState(context: Context) {
         Log.d("STATE DUMP", "Kind ${it.key}: \t${it.value.size} elements ")
     }
 }
+
+@Composable
+fun MyTopAppBar(
+    title: @Composable RowScope.() -> Unit,
+    modifier: Modifier = Modifier,
+    navigationIcon: @Composable (() -> Unit)? = null,
+    actions: @Composable RowScope.() -> Unit = {},
+    backgroundColor: Color = MaterialTheme.colors.surface,
+    contentColor: Color = contentColorFor(backgroundColor),
+    elevation: Dp = AppBarDefaults.TopAppBarElevation
+) {
+    Surface(
+        contentColor = contentColor,
+        elevation = elevation,
+        modifier = modifier
+    ) {
+        CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+            Row(
+                Modifier
+                    .fillMaxWidth()
+                    .padding(AppBarDefaults.ContentPadding),
+                horizontalArrangement = Arrangement.Start,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                if (navigationIcon == null) {
+                    Spacer(TitleInsetWithoutIcon)
+                } else {
+                    Row(TitleIconModifier, verticalAlignment = Alignment.CenterVertically) {
+                        CompositionLocalProvider(
+                            LocalContentAlpha provides ContentAlpha.high,
+                            content = navigationIcon
+                        )
+                    }
+                }
+
+                Row(
+                    Modifier.weight(1f),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    ProvideTextStyle(MaterialTheme.typography.h6) {
+                        title()
+                    }
+                }
+
+                CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+                    Row(
+                        horizontalArrangement = Arrangement.End,
+                        verticalAlignment = Alignment.CenterVertically,
+                        content = actions
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun MyExtensibleTopAppBar(
+    prefixRow: (@Composable () -> Unit)? = null,
+    title: @Composable RowScope.() -> Unit,
+    extendableRow: (@Composable () -> Unit)? = null,
+    modifier: Modifier = Modifier,
+    navigationIcon: @Composable (() -> Unit)? = null,
+    actions: @Composable RowScope.() -> Unit = {},
+    backgroundColor: Color = MaterialTheme.colors.surface,
+    contentColor: Color = contentColorFor(backgroundColor),
+    elevation: Dp = AppBarDefaults.TopAppBarElevation
+) {
+    val expanded = remember { mutableStateOf(false) }
+
+    Surface(
+        color = backgroundColor,
+        contentColor = contentColor,
+        elevation = elevation,
+        modifier = modifier.clickable {
+            expanded.value = !expanded.value
+        }
+    ) {
+        CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+            Column(Modifier.fillMaxWidth()) {
+                Row(
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(AppBarDefaults.ContentPadding),
+                    horizontalArrangement = Arrangement.Start,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    if (navigationIcon == null) {
+                        Spacer(TitleInsetWithoutIcon)
+                    } else {
+                        Row(TitleIconModifier, verticalAlignment = Alignment.CenterVertically) {
+                            CompositionLocalProvider(
+                                LocalContentAlpha provides ContentAlpha.high,
+                                content = navigationIcon
+                            )
+                        }
+                    }
+
+                    Row(
+                        Modifier.weight(1f),
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        ProvideTextStyle(MaterialTheme.typography.h6) {
+                            title()
+                        }
+                    }
+
+                    CompositionLocalProvider(LocalContentAlpha provides ContentAlpha.medium) {
+                        Row(
+                            horizontalArrangement = Arrangement.End,
+                            verticalAlignment = Alignment.CenterVertically,
+                            content = actions
+                        )
+                    }
+                }
+
+                if (expanded.value && extendableRow != null) {
+                    Row(
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(bottom = Size10dp),
+                        horizontalArrangement = Arrangement.Start,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Column {
+                            extendableRow()
+                        }
+                    }
+                }
+
+                if (prefixRow != null) {
+                    prefixRow()
+                }
+            }
+        }
+    }
+}
+
+private val AppBarHeight = 50.dp
+
+// TODO: this should probably be part of the touch target of the start and end icons, clarify this
+private val AppBarHorizontalPadding = 4.dp
+
+// Start inset for the title when there is no navigation icon provided
+private val TitleInsetWithoutIcon = Modifier.width(16.dp - AppBarHorizontalPadding)
+
+// Start inset for the title when there is a navigation icon provided
+private val TitleIconModifier = Modifier.width(48.dp - AppBarHorizontalPadding)

app/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt

@@ -35,6 +35,16 @@ import com.vitorpamplona.amethyst.ui.theme.Size30Modifier
 import com.vitorpamplona.amethyst.ui.theme.placeholderText
 import com.vitorpamplona.amethyst.ui.theme.subtleButton
 
+@Composable
+fun AmethystIcon(iconSize: Dp) {
+    Icon(
+        painter = painterResource(R.drawable.amethyst),
+        null,
+        modifier = Modifier.size(iconSize),
+        tint = Color.Unspecified
+    )
+}
+
 @Composable
 fun FollowingIcon(iconSize: Dp) {
     Icon(
@@ -46,12 +56,11 @@ fun FollowingIcon(iconSize: Dp) {
 }
 
 @Composable
-fun ArrowBackIcon(iconSize: Dp) {
+fun ArrowBackIcon() {
     Icon(
         imageVector = Icons.Default.ArrowBack,
-        contentDescription = null,
+        contentDescription = stringResource(R.string.back),
-        modifier = remember(iconSize) { Modifier.size(iconSize) },
+        tint = MaterialTheme.colors.onSurface
-        tint = MaterialTheme.colors.primary
     )
 }
 

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -527,7 +527,11 @@ fun CommunityHeader(
                 }
             }
         ) {
-            ShortCommunityHeader(baseNote, expanded, accountViewModel, nav)
+            ShortCommunityHeader(
+                baseNote = baseNote,
+                accountViewModel = accountViewModel,
+                nav = nav
+            )
 
             if (expanded.value) {
                 LongCommunityHeader(baseNote, accountViewModel, nav)
@@ -685,7 +689,7 @@ fun LongCommunityHeader(baseNote: AddressableNote, accountViewModel: AccountView
 }
 
 @Composable
-fun ShortCommunityHeader(baseNote: AddressableNote, expanded: MutableState<Boolean>, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
+fun ShortCommunityHeader(baseNote: AddressableNote, fontWeight: FontWeight = FontWeight.Bold, accountViewModel: AccountViewModel, nav: (String) -> Unit) {
     val noteState by baseNote.live().metadata.observeAsState()
     val noteEvent = remember(noteState) { noteState?.note?.event as? CommunityDefinitionEvent } ?: return
 
@@ -710,27 +714,11 @@ fun ShortCommunityHeader(baseNote: AddressableNote, expanded: MutableState<Boole
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Text(
                     text = remember(noteState) { noteEvent.dTag() },
-                    fontWeight = FontWeight.Bold,
+                    fontWeight = fontWeight,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
                 )
             }
-
-            val summary = remember(noteState) {
-                noteEvent.description()?.ifBlank { null }
-            }
-
-            if (summary != null && !expanded.value) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Text(
-                        text = summary,
-                        color = MaterialTheme.colors.placeholderText,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                        fontSize = 12.sp
-                    )
-                }
-            }
         }
 
         Row(

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt

@@ -42,7 +42,6 @@ import androidx.compose.material.icons.filled.Share
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
@@ -573,7 +572,12 @@ fun ChannelHeader(
                 }
             }
         ) {
-            ShortChannelHeader(baseChannel, expanded, accountViewModel, nav, showFlag)
+            ShortChannelHeader(
+                baseChannel = baseChannel,
+                accountViewModel = accountViewModel,
+                nav = nav,
+                showFlag = showFlag
+            )
 
             if (expanded.value) {
                 LongChannelHeader(baseChannel, accountViewModel, nav)
@@ -589,7 +593,7 @@ fun ChannelHeader(
 }
 
 @Composable
-private fun ShowVideoStreaming(
+fun ShowVideoStreaming(
     baseChannel: LiveActivitiesChannel,
     accountViewModel: AccountViewModel
 ) {
@@ -647,10 +651,10 @@ private fun ShowVideoStreaming(
 }
 
 @Composable
-private fun ShortChannelHeader(
+fun ShortChannelHeader(
     baseChannel: Channel,
-    expanded: MutableState<Boolean>,
     accountViewModel: AccountViewModel,
+    fontWeight: FontWeight = FontWeight.Bold,
     nav: (String) -> Unit,
     showFlag: Boolean
 ) {
@@ -691,27 +695,11 @@ private fun ShortChannelHeader(
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Text(
                     text = remember(channelState) { channel.toBestDisplayName() },
-                    fontWeight = FontWeight.Bold,
+                    fontWeight = fontWeight,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis
                 )
             }
-
-            val summary = remember(channelState) {
-                channel.summary()?.ifBlank { null }
-            }
-
-            if (summary != null && !expanded.value) {
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    Text(
-                        text = summary,
-                        color = MaterialTheme.colors.placeholderText,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis,
-                        fontSize = 12.sp
-                    )
-                }
-            }
         }
 
         Row(
@@ -731,7 +719,7 @@ private fun ShortChannelHeader(
 }
 
 @Composable
-private fun LongChannelHeader(
+fun LongChannelHeader(
     baseChannel: Channel,
     accountViewModel: AccountViewModel,
     nav: (String) -> Unit
@@ -965,6 +953,7 @@ fun LiveFlag() {
         text = stringResource(id = R.string.live_stream_live_tag),
         color = Color.White,
         fontWeight = FontWeight.Bold,
+        fontSize = 16.sp,
         modifier = remember {
             Modifier
                 .clip(SmallBorder)

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt

@@ -531,7 +531,7 @@ fun GroupChatroomHeader(
                 )
 
                 Column(modifier = Modifier.padding(start = 10.dp)) {
-                    RoomNameOnlyDisplay(room, Modifier, accountViewModel.userProfile())
+                    RoomNameOnlyDisplay(room, Modifier, FontWeight.Bold, accountViewModel.userProfile())
                     DisplayUserSetAsSubject(room, FontWeight.Normal)
                 }
             }
@@ -714,14 +714,14 @@ fun LongRoomHeader(room: ChatroomKey, accountViewModel: AccountViewModel, nav: (
 }
 
 @Composable
-fun RoomNameOnlyDisplay(room: ChatroomKey, modifier: Modifier, loggedInUser: User) {
+fun RoomNameOnlyDisplay(room: ChatroomKey, modifier: Modifier, fontWeight: FontWeight = FontWeight.Bold, loggedInUser: User) {
     val roomSubject by loggedInUser.live().messages.map {
         it.user.privateChatrooms[room]?.subject
     }.distinctUntilChanged().observeAsState(loggedInUser.privateChatrooms[room]?.subject)
 
     Crossfade(targetState = roomSubject, modifier) {
         if (it != null && it.isNotBlank()) {
-            DisplayRoomSubject(it)
+            DisplayRoomSubject(it, fontWeight)
         }
     }
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/GeoHashScreen.kt

@@ -119,7 +119,7 @@ fun GeoHashHeader(tag: String, modifier: Modifier = StdPadding, account: Account
             ) {
                 DislayGeoTagHeader(tag, remember { Modifier.weight(1f) })
 
-                HashtagActionOptions(tag, account)
+                GeoHashActionOptions(tag, account)
             }
         }
 
@@ -154,7 +154,7 @@ fun DislayGeoTagHeader(geohash: String, modifier: Modifier) {
 }
 
 @Composable
-private fun HashtagActionOptions(
+fun GeoHashActionOptions(
     tag: String,
     accountViewModel: AccountViewModel
 ) {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HashtagScreen.kt

@@ -130,7 +130,7 @@ fun HashtagHeader(tag: String, modifier: Modifier = StdPadding, account: Account
 }
 
 @Composable
-private fun HashtagActionOptions(
+fun HashtagActionOptions(
     tag: String,
     accountViewModel: AccountViewModel
 ) {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ReportNoteDialog.kt

@@ -19,7 +19,6 @@ import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Block
 import androidx.compose.material.icons.filled.Report
 import androidx.compose.runtime.Composable
@@ -41,6 +40,7 @@ import androidx.compose.ui.window.DialogProperties
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.model.ReportEvent
+import com.vitorpamplona.amethyst.ui.note.ArrowBackIcon
 import com.vitorpamplona.amethyst.ui.theme.WarningColor
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
@@ -70,11 +70,7 @@ fun ReportNoteDialog(note: Note, accountViewModel: AccountViewModel, onDismiss:
                     title = { Text(text = stringResource(id = R.string.report_dialog_title)) },
                     navigationIcon = {
                         IconButton(onClick = onDismiss) {
-                            Icon(
+                            ArrowBackIcon()
-                                imageVector = Icons.Default.ArrowBack,
-                                contentDescription = stringResource(R.string.back),
-                                tint = MaterialTheme.colors.onSurface
-                            )
                         }
                     },
                     backgroundColor = MaterialTheme.colors.surface,

app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt

@@ -62,6 +62,7 @@ val Size25dp = 25.dp
 val Size30dp = 30.dp
 val Size34dp = 34.dp
 val Size35dp = 35.dp
+val Size40dp = 40.dp
 val Size55dp = 55.dp
 val Size75dp = 75.dp