put title in topbar

aualbert · Jul 8, 2024 · bdfffee · bdfffee
1 parent 8183417
commit bdfffee
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 16 deletions.
diff --git a/app/src/main/java/me/ash/reader/ui/component/base/RYScaffold.kt b/app/src/main/java/me/ash/reader/ui/component/base/RYScaffold.kt
@@ -5,12 +5,15 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import me.ash.reader.ui.ext.roundClick
 import me.ash.reader.ui.ext.surfaceColorAtElevation
 import me.ash.reader.ui.theme.palette.onDark
 
@@ -21,6 +24,8 @@ fun RYScaffold(
     topBarTonalElevation: Dp = 0.dp,
     containerTonalElevation: Dp = 0.dp,
     navigationIcon: (@Composable () -> Unit)? = null,
+    title: String = "",
+    onTitleClick: (() -> Unit)? = null,
     actions: (@Composable RowScope.() -> Unit)? = null,
     bottomBar: (@Composable () -> Unit)? = null,
     floatingActionButton: (@Composable () -> Unit)? = null,
@@ -41,7 +46,16 @@ fun RYScaffold(
         topBar = {
             if (navigationIcon != null || actions != null) {
                 TopAppBar(
-                    title = {},
+                    title = {Text(
+                        modifier = Modifier
+                            .roundClick(enabled = onTitleClick != null) { onTitleClick?.invoke() }
+                            .padding(8.dp),
+                        text = title,
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )},
                     navigationIcon = { navigationIcon?.invoke() },
                     actions = { actions?.invoke(this) },
                     colors = TopAppBarDefaults.topAppBarColors(

diff --git a/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt b/app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt
@@ -210,6 +210,8 @@ fun FeedsPage(
                 }
             }
         },
+        title = feedsUiState.account?.name ?: "",
+        onTitleClick = { accountTabVisible = true },
         actions = {
             FeedbackIconButton(
                 modifier = Modifier.rotate(if (isSyncing) angle else 0f),
@@ -234,12 +236,12 @@ fun FeedsPage(
             LazyColumn (
                 state = listState
             ) {
-                item {
-                    DisplayText(
-                        text = feedsUiState.account?.name ?: "",
-                        desc = if (isSyncing) stringResource(R.string.syncing) else "",
-                    ) { accountTabVisible = true }
-                }
+//                item {
+//                    DisplayText(
+//                        text = feedsUiState.account?.name ?: "",
+//                        desc = if (isSyncing) stringResource(R.string.syncing) else "",
+//                    ) { accountTabVisible = true }
+//                }
                 item {
                     Banner(
                         title = filterUiState.filter.toName(),

diff --git a/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt b/app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt
@@ -200,6 +200,11 @@ fun FlowPage(
                 }
             }
         },
+        title = when {
+            filterUiState.group != null -> filterUiState.group.name
+            filterUiState.feed != null -> filterUiState.feed.name
+            else -> filterUiState.filter.toName()
+        },
         actions = {
             RYExtensibleVisibility(visible = !filterUiState.filter.isStarred()) {
                 FeedbackIconButton(
@@ -257,15 +262,15 @@ fun FlowPage(
                     state = listState,
                 ) {
                     item {
-                        DisplayText(
-                            modifier = Modifier.padding(start = if (articleListFeedIcon.value) 30.dp else 0.dp),
-                            text = when {
-                                filterUiState.group != null -> filterUiState.group.name
-                                filterUiState.feed != null -> filterUiState.feed.name
-                                else -> filterUiState.filter.toName()
-                            },
-                            desc = if (isSyncing) stringResource(R.string.syncing) else "",
-                        )
+//                        DisplayText(
+//                            modifier = Modifier.padding(start = if (articleListFeedIcon.value) 30.dp else 0.dp),
+//                            text = when {
+//                                filterUiState.group != null -> filterUiState.group.name
+//                                filterUiState.feed != null -> filterUiState.feed.name
+//                                else -> filterUiState.filter.toName()
+//                            },
+//                            desc = if (isSyncing) stringResource(R.string.syncing) else "",
+//                        )
                         RYExtensibleVisibility(visible = markAsRead) {
                             Spacer(modifier = Modifier.height((56 + 24 + 10).dp))
                         }