Skip to content

Refactor of RYScaffold to use TopAppBar with scrolling behaviour #873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yajaru wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Refactor of RYScaffold to use TopAppBar with scrolling behaviour #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6e562b
Add button for switching account to Feeds page
Nov 13, 2024
1efb5b9
Refactor RYScaffold to use a LargeAppTopBar
Nov 13, 2024
3ab503e
Make RYScaffold fill max size
Nov 13, 2024
b496606
Clean up Tips and Support page layout
Nov 13, 2024
2ff6ca6
Clean up Start Up page layout
Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions app/src/main/java/me/ash/reader/ui/component/base/RYScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
package me.ash.reader.ui.component.base

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.nestedscroll.nestedScroll
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.surfaceColorAtElevation
Expand All @@ -23,36 +29,43 @@ fun RYScaffold(
containerTonalElevation: Dp = 0.dp,
navigationIcon: (@Composable () -> Unit)? = null,
actions: (@Composable RowScope.() -> Unit)? = null,
topBar: (@Composable () -> Unit)? = null,
bottomBar: (@Composable () -> Unit)? = null,
floatingActionButton: (@Composable () -> Unit)? = null,
content: @Composable () -> Unit = {},
title: @Composable () -> String,
appBarOnClick: (() -> Unit)? = null
) {
val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())

Scaffold(
modifier = modifier
.fillMaxSize()
.background(
MaterialTheme.colorScheme.surfaceColorAtElevation(
topBarTonalElevation,
color = containerColor
)
),
)
.nestedScroll(scrollBehavior.nestedScrollConnection),
containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
containerTonalElevation,
color = containerColor
) onDark MaterialTheme.colorScheme.surface,
topBar = {
if (topBar != null) topBar() else if (navigationIcon != null || actions != null) {
TopAppBar(
title = {},
navigationIcon = { navigationIcon?.invoke() },
actions = { actions?.invoke(this) },
colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
topBarTonalElevation
),
)
)
}
LargeTopAppBar(
modifier = Modifier.clickable(
onClick = { appBarOnClick?.invoke() },
indication = null,
interactionSource = remember { MutableInteractionSource() }
),
title = { Text(text=title.invoke(), maxLines = 1, overflow = TextOverflow.Ellipsis) },
navigationIcon = { navigationIcon?.invoke() },
actions = { actions?.invoke(this) },
colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(topBarTonalElevation)
),
scrollBehavior = scrollBehavior
)
},
content = {
Column {
Expand Down
88 changes: 38 additions & 50 deletions app/src/main/java/me/ash/reader/ui/page/home/feeds/FeedsPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.KeyboardArrowRight
import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material.icons.rounded.Add
import androidx.compose.material.icons.rounded.SwitchAccount
import androidx.compose.material.icons.rounded.UnfoldLess
import androidx.compose.material.icons.rounded.UnfoldMore
import androidx.compose.material.rememberModalBottomSheetState
Expand Down Expand Up @@ -53,6 +54,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavHostController
Expand Down Expand Up @@ -211,50 +213,42 @@ fun FeedsPage(
RYScaffold(
topBarTonalElevation = topBarTonalElevation.value.dp,
containerTonalElevation = groupListTonalElevation.value.dp,
topBar = {
TopAppBar(
modifier = Modifier.clickable(
onClick = {
scope.launch {
if (listState.firstVisibleItemIndex != 0) {
listState.animateScrollToItem(0)
}
}
},
indication = null,
interactionSource = remember { MutableInteractionSource() }
),
title = {},
navigationIcon = {
FeedbackIconButton(
modifier = Modifier.size(20.dp),
imageVector = Icons.Outlined.Settings,
contentDescription = stringResource(R.string.settings),
tint = MaterialTheme.colorScheme.onSurface,
showBadge = newVersion.whetherNeedUpdate(currentVersion, skipVersion),
) {
navController.navigate(RouteName.SETTINGS) {
launchSingleTop = true
}
}
},
actions = {
if (subscribeViewModel.rssService.get().addSubscription) {
FeedbackIconButton(
imageVector = Icons.Rounded.Add,
contentDescription = stringResource(R.string.subscribe),
tint = MaterialTheme.colorScheme.onSurface,
) {
subscribeViewModel.showDrawer()
}
}
},
colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
topBarTonalElevation.value.dp
),
)
)
title = { feedsUiState.account?.name ?: "Foobar" },
appBarOnClick = { scope.launch {
if (listState.firstVisibleItemIndex != 0) {
listState.animateScrollToItem(0)
}
} },
navigationIcon = {
FeedbackIconButton(
modifier = Modifier.size(20.dp),
imageVector = Icons.Outlined.Settings,
contentDescription = stringResource(R.string.settings),
tint = MaterialTheme.colorScheme.onSurface,
showBadge = newVersion.whetherNeedUpdate(currentVersion, skipVersion),
) {
navController.navigate(RouteName.SETTINGS) {
launchSingleTop = true
}
}
},
actions = {
FeedbackIconButton(
imageVector = Icons.Rounded.SwitchAccount,
contentDescription = stringResource(R.string.switch_account),
tint = MaterialTheme.colorScheme.onSurface,
) {
accountTabVisible = true
}
if (subscribeViewModel.rssService.get().addSubscription) {
FeedbackIconButton(
imageVector = Icons.Rounded.Add,
contentDescription = stringResource(R.string.subscribe),
tint = MaterialTheme.colorScheme.onSurface,
) {
subscribeViewModel.showDrawer()
}
}
},
content = {
PullToRefreshBox(
Expand All @@ -266,12 +260,6 @@ fun FeedsPage(
modifier = Modifier.fillMaxSize(),
state = listState
) {
item {
DisplayText(
text = feedsUiState.account?.name ?: "",
desc = "",
) { accountTabVisible = true }
}
item {
Banner(
title = filterUiState.filter.toName(),
Expand Down
135 changes: 58 additions & 77 deletions app/src/main/java/me/ash/reader/ui/page/home/flow/FlowPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.compose.material.icons.rounded.Search
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.LargeTopAppBar
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
Expand All @@ -39,6 +40,7 @@ import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavHostController
Expand Down Expand Up @@ -234,79 +236,67 @@ fun FlowPage(
RYScaffold(
topBarTonalElevation = topBarTonalElevation.value.dp,
containerTonalElevation = articleListTonalElevation.value.dp,
topBar = {
TopAppBar(
modifier = Modifier.clickable(
onClick = {
scope.launch {
if (listState.firstVisibleItemIndex != 0) {
listState.animateScrollToItem(0)
}
}
title = { when {
filterUiState.group != null -> filterUiState.group.name
filterUiState.feed != null -> filterUiState.feed.name
else -> filterUiState.filter.toName()
} },
appBarOnClick = { scope.launch {
if (listState.firstVisibleItemIndex != 0) {
listState.animateScrollToItem(0)
}
} },
navigationIcon = {
FeedbackIconButton(
imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
contentDescription = stringResource(R.string.back),
tint = MaterialTheme.colorScheme.onSurface
) {
onSearch = false
if (navController.previousBackStackEntry == null) {
navController.navigate(RouteName.FEEDS) {
launchSingleTop = true
}
} else {
navController.popBackStack()
}
} },
actions = {
RYExtensibleVisibility(visible = !filterUiState.filter.isStarred()) {
FeedbackIconButton(
imageVector = Icons.Rounded.DoneAll,
contentDescription = stringResource(R.string.mark_all_as_read),
tint = if (markAsRead) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.onSurface
},
indication = null,
interactionSource = remember { MutableInteractionSource() }
),
title = {},
navigationIcon = {
FeedbackIconButton(
imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
contentDescription = stringResource(R.string.back),
tint = MaterialTheme.colorScheme.onSurface
) {
onSearch = false
if (navController.previousBackStackEntry == null) {
navController.navigate(RouteName.FEEDS) {
launchSingleTop = true
}
} else {
navController.popBackStack()
) {
scope.launch {
if (flowUiState.listState.firstVisibleItemIndex != 0) {
flowUiState.listState.animateScrollToItem(0)
}
markAsRead = !markAsRead
onSearch = false
}
}
}
FeedbackIconButton(
imageVector = Icons.Rounded.Search,
contentDescription = stringResource(R.string.search),
tint = if (onSearch) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.onSurface
},
actions = {
RYExtensibleVisibility(visible = !filterUiState.filter.isStarred()) {
FeedbackIconButton(
imageVector = Icons.Rounded.DoneAll,
contentDescription = stringResource(R.string.mark_all_as_read),
tint = if (markAsRead) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.onSurface
},
) {
scope.launch {
if (flowUiState.listState.firstVisibleItemIndex != 0) {
flowUiState.listState.animateScrollToItem(0)
}
markAsRead = !markAsRead
onSearch = false
}
}
}
FeedbackIconButton(
imageVector = Icons.Rounded.Search,
contentDescription = stringResource(R.string.search),
tint = if (onSearch) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.onSurface
},
) {
scope.launch {
if (flowUiState.listState.firstVisibleItemIndex != 0) {
flowUiState.listState.animateScrollToItem(0)
}
onSearch = !onSearch
}
) {
scope.launch {
if (flowUiState.listState.firstVisibleItemIndex != 0) {
flowUiState.listState.animateScrollToItem(0)
}
}, colors = TopAppBarDefaults.topAppBarColors(
containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
topBarTonalElevation.value.dp
),
)
)
},
onSearch = !onSearch
}
} },
content = {
PullToRefreshBox(
state = syncingState,
Expand All @@ -318,15 +308,6 @@ 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 = "",
)
RYExtensibleVisibility(visible = markAsRead) {
Spacer(modifier = Modifier.height((56 + 24 + 10).dp))
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/me/ash/reader/ui/page/settings/SettingsPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ import androidx.compose.material.icons.outlined.TouchApp
import androidx.compose.material.icons.rounded.Close
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.hilt.navigation.compose.hiltViewModel
Expand Down Expand Up @@ -66,11 +68,9 @@ fun SettingsPage(
navController.popBackStack()
}
},
title = { stringResource(R.string.settings) },
content = {
LazyColumn {
item {
DisplayText(text = stringResource(R.string.settings), desc = "")
}
item {
Box {
if (newVersion.whetherNeedUpdate(currentVersion, skipVersion)) {
Expand Down
Loading