mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-17 11:59:19 +01:00
Remove top bar workaround (#8497)
Fixed upstream and we currently using small top bar which doesn't affected
This commit is contained in:
parent
6ce54eb845
commit
11ed47397d
@ -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 ->
|
||||||
|
Loading…
Reference in New Issue
Block a user