From 94034c8cfce3b97670e24d28f0eca0d9eb748eb6 Mon Sep 17 00:00:00 2001 From: Infi Date: Mon, 8 Jan 2024 01:27:15 +0100 Subject: [PATCH] fix: regression in which "log out" is not error coloured Signed-off-by: Infi --- .../revolt/screens/settings/SettingsScreen.kt | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt index ce5abb60..64dc61c5 100644 --- a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt @@ -278,31 +278,33 @@ fun SettingsScreen( } ) - CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.error) { - ListItem( - headlineContent = { + ListItem( + headlineContent = { + CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.error) { Text( text = stringResource(id = R.string.logout) ) - }, - leadingContent = { + } + }, + leadingContent = { + CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.error) { Icon( imageVector = Icons.Default.Close, contentDescription = stringResource(id = R.string.logout), ) - }, - modifier = Modifier - .testTag("settings_view_logout") - .clickable { - viewModel.logout() - navController.navigate("login/greeting") { - popUpTo("chat") { - inclusive = true - } + } + }, + modifier = Modifier + .testTag("settings_view_logout") + .clickable { + viewModel.logout() + navController.navigate("login/greeting") { + popUpTo("chat") { + inclusive = true } } - ) - } + } + ) } } }