From 4ce89abbbf4e464359a01879c0a03011f34c7e3c Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Tue, 5 Dec 2023 11:37:35 -0600
Subject: [PATCH] Update toolbar action colors (#325)

---
 .../ui/platform/components/BitwardenMediumTopAppBar.kt     | 4 +++-
 .../ui/platform/components/BitwardenOverflowActionItem.kt  | 1 -
 .../ui/platform/components/BitwardenTextButton.kt          | 7 ++-----
 .../bitwarden/ui/platform/components/BitwardenTopAppBar.kt | 5 +++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenMediumTopAppBar.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenMediumTopAppBar.kt
index d2fad1bd15..bfa420e020 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenMediumTopAppBar.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenMediumTopAppBar.kt
@@ -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,
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenOverflowActionItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenOverflowActionItem.kt
index 66f25d6168..fdfe3721d7 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenOverflowActionItem.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenOverflowActionItem.kt
@@ -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(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTextButton.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTextButton.kt
index d1cca572ed..bd1a094d6f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTextButton.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTextButton.kt
@@ -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(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTopAppBar.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTopAppBar.kt
index 34a6407c2e..a363f47a64 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTopAppBar.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenTopAppBar.kt
@@ -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,