From 11ed47397d6922e0f34ebb6ac8057bb87b46d165 Mon Sep 17 00:00:00 2001 From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com> Date: Fri, 11 Nov 2022 09:26:56 +0700 Subject: [PATCH] Remove top bar workaround (#8497) Fixed upstream and we currently using small top bar which doesn't affected --- .../settings/screen/SettingsMainScreen.kt | 57 +++++++++---------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt index 47f11b91d7..d066e99e21 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt @@ -84,39 +84,34 @@ object SettingsMainScreen : Screen { Scaffold( topBarScrollBehavior = TopAppBarDefaults.pinnedScrollBehavior(topBarState), topBar = { scrollBehavior -> - // https://issuetracker.google.com/issues/249688556 - MaterialTheme( - colorScheme = MaterialTheme.colorScheme.copy(surface = containerColor), - ) { - TopAppBar( - title = { - Text( - text = stringResource(R.string.label_settings), - modifier = Modifier.padding(start = 8.dp), + TopAppBar( + title = { + Text( + text = stringResource(R.string.label_settings), + modifier = Modifier.padding(start = 8.dp), + ) + }, + navigationIcon = { + IconButton(onClick = backPress::invoke) { + Icon( + imageVector = Icons.Outlined.ArrowBack, + contentDescription = stringResource(R.string.abc_action_bar_up_description), ) - }, - navigationIcon = { - IconButton(onClick = backPress::invoke) { - Icon( - imageVector = Icons.Outlined.ArrowBack, - contentDescription = stringResource(R.string.abc_action_bar_up_description), - ) - } - }, - actions = { - AppBarActions( - listOf( - 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, content = { contentPadding ->