github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-25 07:41:55 -05:00
Code Issues 144 Packages Projects Releases 118 Wiki Activity

Update toolbar action colors (#325)

Browse Source
This commit is contained in:
David Perez
2023-12-05 11:37:35 -06:00
committed by Álison Fernandes
parent fad80fbd69
commit 4ce89abbbf
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenMediumTopAppBar.kt
View File

@@ -41,13 +41,15 @@ fun BitwardenMediumTopAppBar(
colors = TopAppBarDefaults.largeTopAppBarColors(
containerColor = MaterialTheme.colorScheme.surface,
scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainer,
navigationIconContentColor = MaterialTheme.colorScheme.onSurface,
titleContentColor = MaterialTheme.colorScheme.onSurface,
actionIconContentColor = MaterialTheme.colorScheme.onSurfaceVariant,
),
scrollBehavior = scrollBehavior,
title = {
Text(
text = title,
style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onSurface,
)
},
actions = actions,

1
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenOverflowActionItem.kt
View File

@@ -48,7 +48,6 @@ fun BitwardenOverflowActionItem(
Icon(
painter = painterResource(id = R.drawable.ic_more),
contentDescription = stringResource(id = R.string.more),
tint = MaterialTheme.colorScheme.onSurface,
)
}
DropdownMenu(

7
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTextButton.kt
View File

@@ -1,6 +1,7 @@
package com.x8bit.bitwarden.ui.platform.components
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
@@ -27,14 +28,10 @@ fun BitwardenTextButton(
onClick = onClick,
modifier = modifier,
enabled = isEnabled,
colors = ButtonDefaults.textButtonColors(),
) {
Text(
text = label,
color = if (isEnabled) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.onSurface.copy(alpha = .38f)
},
style = MaterialTheme.typography.labelLarge,
modifier = Modifier
.padding(

5
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTopAppBar.kt
View File

@@ -71,6 +71,9 @@ fun BitwardenTopAppBar(
colors = TopAppBarDefaults.largeTopAppBarColors(
containerColor = MaterialTheme.colorScheme.surface,
scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainer,
navigationIconContentColor = MaterialTheme.colorScheme.onSurface,
titleContentColor = MaterialTheme.colorScheme.onSurface,
actionIconContentColor = MaterialTheme.colorScheme.onSurfaceVariant,
),
scrollBehavior = scrollBehavior,
navigationIcon = {
@@ -81,7 +84,6 @@ fun BitwardenTopAppBar(
Icon(
painter = it.navigationIcon,
contentDescription = it.navigationIconContentDescription,
tint = MaterialTheme.colorScheme.onSurface,
)
}
}
@@ -90,7 +92,6 @@ fun BitwardenTopAppBar(
Text(
text = title,
style = MaterialTheme.typography.titleLarge,
color = MaterialTheme.colorScheme.onSurface,
)
},
actions = actions,