yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove top bar workaround (#8497)

Browse Source 
Fixed upstream and we currently using small top bar which doesn't affected
This commit is contained in:
Ivan Iskandar 2022-11-11 09:26:56 +07:00 committed by GitHub
parent 6ce54eb845
commit 11ed47397d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt
View File

@ -84,39 +84,34 @@ object SettingsMainScreen : Screen {
Scaffold( Scaffold(
topBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(topBarState), topBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(topBarState),
topBar = { scrollBehavior -> topBar = { scrollBehavior ->
// https://issuetracker.google.com/issues/249688556 TopAppBar(
MaterialTheme( title = {
colorScheme = MaterialTheme.colorScheme.copy(surface = containerColor), Text(
) { text = stringResource(R.string.label_settings),
TopAppBar( modifier = Modifier.padding(start = 8.dp),
title = { )
Text( },
text = stringResource(R.string.label_settings), navigationIcon = {
modifier = Modifier.padding(start = 8.dp), IconButton(onClick = backPress::invoke) {
Icon(
imageVector = Icons.Outlined.ArrowBack,
contentDescription = stringResource(R.string.abc_action_bar_up_description),
) )
}, }
navigationIcon = { },
IconButton(onClick = backPress::invoke) { actions = {
Icon( AppBarActions(
imageVector = Icons.Outlined.ArrowBack, listOf(
contentDescription = stringResource(R.string.abc_action_bar_up_description), AppBar.Action(
) title = stringResource(R.string.action_search),
} icon = Icons.Outlined.Search,
}, onClick = { navigator.navigate(SettingsSearchScreen(), twoPane) },
actions = {
AppBarActions(
listOf(
AppBar.Action(
title = stringResource(R.string.action_search),
icon = Icons.Outlined.Search,
onClick = { navigator.navigate(SettingsSearchScreen(), twoPane) },
),
), ),
) ),
}, )
scrollBehavior = scrollBehavior, },
) scrollBehavior = scrollBehavior,
} )
}, },
containerColor = containerColor, containerColor = containerColor,
content = { contentPadding -> content = { contentPadding ->