PM-12322: Complete app-wide color scheme update

bitwarden · Oct 3, 2024 · a229d85 · a229d85
1 parent fd6b276
commit a229d85
Show file tree

Hide file tree

Showing 149 changed files with 1,132 additions and 1,160 deletions.
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt
@@ -15,7 +15,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
@@ -221,14 +220,14 @@ private fun OrderedHeaderContent() {
         Text(
             text = stringResource(R.string.turn_on_autofill),
             style = BitwardenTheme.typography.titleMedium,
-            color = MaterialTheme.colorScheme.onSurface,
+            color = BitwardenTheme.colorScheme.text.primary,
             textAlign = TextAlign.Center,
         )
         Spacer(modifier = Modifier.height(8.dp))
         Text(
             text = stringResource(R.string.use_autofill_to_log_into_your_accounts),
             style = BitwardenTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            color = BitwardenTheme.colorScheme.text.primary,
             textAlign = TextAlign.Center,
             // Apply similar line breaks to design
             modifier = Modifier.sizeIn(maxWidth = 300.dp),

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupCompleteScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupCompleteScreen.kt
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
@@ -92,7 +91,7 @@ private fun SetupCompleteContent(
         Text(
             text = stringResource(R.string.youre_all_set),
             style = BitwardenTheme.typography.titleMedium,
-            color = MaterialTheme.colorScheme.onSurface,
+            color = BitwardenTheme.colorScheme.text.primary,
             textAlign = TextAlign.Center,
             modifier = Modifier
                 .align(CenterHorizontally)
@@ -102,7 +101,7 @@ private fun SetupCompleteContent(
         Text(
             text = stringResource(R.string.what_bitwarden_has_to_offer),
             style = BitwardenTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            color = BitwardenTheme.colorScheme.text.primary,
             textAlign = TextAlign.Center,
             modifier = Modifier
                 .align(CenterHorizontally)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt
@@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
@@ -229,7 +228,7 @@ private fun ColumnScope.SetupUnlockHeaderPortrait() {
     Text(
         text = stringResource(id = R.string.set_up_unlock),
         style = BitwardenTheme.typography.titleMedium,
-        color = MaterialTheme.colorScheme.onSurface,
+        color = BitwardenTheme.colorScheme.text.primary,
         textAlign = TextAlign.Center,
         modifier = Modifier
             .fillMaxWidth()
@@ -243,7 +242,7 @@ private fun ColumnScope.SetupUnlockHeaderPortrait() {
             id = R.string.set_up_biometrics_or_choose_a_pin_code_to_quickly_access_your_vault_and_autofill_your_logins,
         ),
         style = BitwardenTheme.typography.bodyMedium,
-        color = MaterialTheme.colorScheme.onSurface,
+        color = BitwardenTheme.colorScheme.text.primary,
         textAlign = TextAlign.Center,
         modifier = Modifier
             .fillMaxWidth()
@@ -275,7 +274,7 @@ private fun SetupUnlockHeaderLandscape(
             Text(
                 text = stringResource(id = R.string.set_up_unlock),
                 style = BitwardenTheme.typography.titleMedium,
-                color = MaterialTheme.colorScheme.onSurface,
+                color = BitwardenTheme.colorScheme.text.primary,
                 textAlign = TextAlign.Center,
                 modifier = Modifier.fillMaxWidth(),
             )
@@ -287,7 +286,7 @@ private fun SetupUnlockHeaderLandscape(
                     id = R.string.set_up_biometrics_or_choose_a_pin_code_to_quickly_access_your_vault_and_autofill_your_logins,
                 ),
                 style = BitwardenTheme.typography.bodyMedium,
-                color = MaterialTheme.colorScheme.onSurface,
+                color = BitwardenTheme.colorScheme.text.primary,
                 textAlign = TextAlign.Center,
                 modifier = Modifier.fillMaxWidth(),
             )

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailScreen.kt
@@ -15,7 +15,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
@@ -151,7 +150,7 @@ private fun CheckEmailContent(
             text = stringResource(id = R.string.check_your_email),
             textAlign = TextAlign.Center,
             style = BitwardenTheme.typography.titleMedium,
-            color = MaterialTheme.colorScheme.onSurface,
+            color = BitwardenTheme.colorScheme.text.primary,
             modifier = Modifier
                 .padding(horizontal = 8.dp)
                 .wrapContentHeight()
@@ -166,7 +165,7 @@ private fun CheckEmailContent(
             ),
             highlights = listOf(email),
             highlightStyle = SpanStyle(
-                color = MaterialTheme.colorScheme.onSurface,
+                color = BitwardenTheme.colorScheme.text.primary,
                 fontSize = BitwardenTheme.typography.bodyMedium.fontSize,
                 fontWeight = FontWeight.Bold,
             ),
@@ -186,7 +185,7 @@ private fun CheckEmailContent(
         Text(
             text = stringResource(R.string.select_the_link_in_the_email_to_verify_your_email_address_and_continue_creating_your_account),
             style = BitwardenTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurface,
+            color = BitwardenTheme.colorScheme.text.primary,
             textAlign = TextAlign.Center,
             modifier = Modifier
                 .padding(horizontal = 8.dp)
@@ -226,7 +225,7 @@ private fun CheckEmailLegacyContent(
         Spacer(modifier = Modifier.height(32.dp))
         Image(
             painter = rememberVectorPainter(id = R.drawable.email_check),
-            colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
+            colorFilter = ColorFilter.tint(BitwardenTheme.colorScheme.icon.secondary),
             contentDescription = null,
             contentScale = ContentScale.FillHeight,
             modifier = Modifier
@@ -239,7 +238,7 @@ private fun CheckEmailLegacyContent(
             text = stringResource(id = R.string.check_your_email),
             textAlign = TextAlign.Center,
             style = BitwardenTheme.typography.headlineSmall,
-            color = MaterialTheme.colorScheme.onSurface,
+            color = BitwardenTheme.colorScheme.text.primary,
             modifier = Modifier
                 .padding(horizontal = 24.dp)
                 .wrapContentHeight()
@@ -255,7 +254,7 @@ private fun CheckEmailLegacyContent(
             ),
             highlights = listOf(email),
             highlightStyle = SpanStyle(
-                color = MaterialTheme.colorScheme.onSurface,
+                color = BitwardenTheme.colorScheme.text.primary,
                 fontSize = BitwardenTheme.typography.bodyMedium.fontSize,
                 fontWeight = FontWeight.Bold,
             ),

diff --git a/...va/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt b/...va/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt
@@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
@@ -142,8 +141,8 @@ fun CompleteRegistrationScreen(
             BitwardenTopAppBar(
                 title = stringResource(
                     id = R.string.create_account
-                    .takeIf { state.onboardingEnabled }
-                    ?: R.string.set_password),
+                        .takeIf { state.onboardingEnabled }
+                        ?: R.string.set_password),
                 scrollBehavior = scrollBehavior,
                 navigationIcon = rememberVectorPainter(id = R.drawable.ic_back),
                 navigationIconContentDescription = stringResource(id = R.string.back),
@@ -362,7 +361,7 @@ private fun LegacyHeaderContent(
             userEmail,
         ),
         style = BitwardenTheme.typography.bodyMedium,
-        color = MaterialTheme.colorScheme.onSurfaceVariant,
+        color = BitwardenTheme.colorScheme.text.primary,
         modifier = modifier
             .fillMaxWidth(),
     )
@@ -386,7 +385,7 @@ private fun OrderedHeaderContent() {
         Text(
             text = stringResource(R.string.choose_your_master_password),
             style = BitwardenTheme.typography.titleMedium,
-            color = MaterialTheme.colorScheme.onSurface,
+            color = BitwardenTheme.colorScheme.text.primary,
             textAlign = TextAlign.Center,
         )
         Spacer(modifier = Modifier.height(8.dp))
@@ -395,7 +394,7 @@ private fun OrderedHeaderContent() {
                 R.string.choose_a_unique_and_strong_password_to_keep_your_information_safe,
             ),
             style = BitwardenTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurface,
+            color = BitwardenTheme.colorScheme.text.primary,
             textAlign = TextAlign.Center,
         )
     }

diff --git a/...ava/com/x8bit/bitwarden/ui/auth/feature/completeregistration/PasswordStrengthIndicator.kt b/...ava/com/x8bit/bitwarden/ui/auth/feature/completeregistration/PasswordStrengthIndicator.kt
@@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -31,7 +30,6 @@ import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.ui.platform.base.util.asText
 import com.x8bit.bitwarden.ui.platform.components.util.rememberVectorPainter
 import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
-import com.x8bit.bitwarden.ui.platform.theme.LocalNonMaterialColors
 
 /**
  * Draws a password indicator that displays password strength based on the given [state].
@@ -56,12 +54,12 @@ fun PasswordStrengthIndicator(
         label = "Width Percent State",
     )
     val indicatorColor = when (state) {
-        PasswordStrengthState.NONE -> MaterialTheme.colorScheme.error
-        PasswordStrengthState.WEAK_1 -> MaterialTheme.colorScheme.error
-        PasswordStrengthState.WEAK_2 -> MaterialTheme.colorScheme.error
-        PasswordStrengthState.WEAK_3 -> LocalNonMaterialColors.current.passwordWeak
-        PasswordStrengthState.GOOD -> MaterialTheme.colorScheme.primary
-        PasswordStrengthState.STRONG -> LocalNonMaterialColors.current.passwordStrong
+        PasswordStrengthState.NONE -> BitwardenTheme.colorScheme.status.error
+        PasswordStrengthState.WEAK_1 -> BitwardenTheme.colorScheme.status.error
+        PasswordStrengthState.WEAK_2 -> BitwardenTheme.colorScheme.status.weak2
+        PasswordStrengthState.WEAK_3 -> BitwardenTheme.colorScheme.status.weak2
+        PasswordStrengthState.GOOD -> BitwardenTheme.colorScheme.status.good
+        PasswordStrengthState.STRONG -> BitwardenTheme.colorScheme.status.strong
     }
     val animatedIndicatorColor by animateColorAsState(
         targetValue = indicatorColor,
@@ -82,7 +80,7 @@ fun PasswordStrengthIndicator(
             Modifier
                 .fillMaxWidth()
                 .height(4.dp)
-                .background(MaterialTheme.colorScheme.surfaceContainerHigh),
+                .background(BitwardenTheme.colorScheme.sliderButton.unfilled),
         ) {
             Box(
                 modifier = Modifier
@@ -124,12 +122,11 @@ private fun MinimumCharacterCount(
     minimumRequirementMet: Boolean,
     minimumCharacterCount: Int,
 ) {
-    val nonMaterialColors = LocalNonMaterialColors.current
     val characterCountColor by animateColorAsState(
         targetValue = if (minimumRequirementMet) {
-            nonMaterialColors.passwordStrong
+            BitwardenTheme.colorScheme.status.strong
         } else {
-            MaterialTheme.colorScheme.surfaceDim
+            BitwardenTheme.colorScheme.text.secondary
         },
         label = "minmumCharacterCountColor",
     )

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
@@ -77,6 +76,7 @@ import com.x8bit.bitwarden.ui.platform.components.field.BitwardenTextField
 import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold
 import com.x8bit.bitwarden.ui.platform.components.text.BitwardenClickableText
 import com.x8bit.bitwarden.ui.platform.components.toggle.BitwardenSwitch
+import com.x8bit.bitwarden.ui.platform.components.toggle.color.bitwardenSwitchColors
 import com.x8bit.bitwarden.ui.platform.components.util.rememberVectorPainter
 import com.x8bit.bitwarden.ui.platform.composition.LocalIntentManager
 import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
@@ -309,7 +309,9 @@ private fun TermsAndPrivacySwitch(
             }
             .clickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = ripple(color = MaterialTheme.colorScheme.primary),
+                indication = ripple(
+                    color = BitwardenTheme.colorScheme.background.pressed,
+                ),
                 onClick = { onCheckedChange.invoke(!isChecked) },
             )
             .padding(start = 16.dp)
@@ -321,12 +323,13 @@ private fun TermsAndPrivacySwitch(
                 .width(52.dp),
             checked = isChecked,
             onCheckedChange = null,
+            colors = bitwardenSwitchColors(),
         )
         Column(Modifier.padding(start = 16.dp, top = 4.dp, bottom = 4.dp)) {
             Text(
                 text = stringResource(id = R.string.accept_policies),
                 style = BitwardenTheme.typography.bodyLarge,
-                color = MaterialTheme.colorScheme.onSurface,
+                color = BitwardenTheme.colorScheme.text.primary,
             )
             FlowRow(
                 horizontalArrangement = Arrangement.Start,
@@ -340,12 +343,11 @@ private fun TermsAndPrivacySwitch(
                     onClick = onTermsClick,
                     style = BitwardenTheme.typography.bodyMedium,
                     innerPadding = PaddingValues(vertical = 4.dp, horizontal = 0.dp),
-                    color = MaterialTheme.colorScheme.primary,
                 )
                 Text(
                     text = ",",
                     style = BitwardenTheme.typography.bodyMedium,
-                    color = MaterialTheme.colorScheme.primary,
+                    color = BitwardenTheme.colorScheme.text.primary,
                     modifier = Modifier.padding(vertical = 4.dp),
                 )
                 Spacer(modifier = Modifier.width(4.dp))
@@ -354,7 +356,6 @@ private fun TermsAndPrivacySwitch(
                     onClick = onPrivacyPolicyClick,
                     style = BitwardenTheme.typography.bodyMedium,
                     innerPadding = PaddingValues(vertical = 4.dp, horizontal = 0.dp),
-                    color = MaterialTheme.colorScheme.primary,
                 )
             }
         }

diff --git a/.../main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt b/.../main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.rememberTopAppBarState
@@ -157,7 +156,7 @@ private fun EnterpriseSignOnScreenContent(
             text = stringResource(id = R.string.log_in_sso_summary),
             textAlign = TextAlign.Start,
             style = BitwardenTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            color = BitwardenTheme.colorScheme.text.primary,
             modifier = Modifier
                 .padding(horizontal = 16.dp)
                 .fillMaxWidth(),

diff --git a/.../x8bit/bitwarden/ui/auth/feature/expiredregistrationlink/ExpiredRegistrationLinkScreen.kt b/.../x8bit/bitwarden/ui/auth/feature/expiredregistrationlink/ExpiredRegistrationLinkScreen.kt
@@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
@@ -108,7 +107,7 @@ private fun ExpiredRegistrationLinkContent(
         Text(
             text = stringResource(R.string.expired_link),
             style = BitwardenTheme.typography.titleMedium,
-            color = MaterialTheme.colorScheme.onSurface,
+            color = BitwardenTheme.colorScheme.text.primary,
             textAlign = TextAlign.Center,
             modifier = Modifier
                 .fillMaxWidth()
@@ -118,7 +117,7 @@ private fun ExpiredRegistrationLinkContent(
         Text(
             text = stringResource(R.string.please_restart_registration_or_try_logging_in),
             style = BitwardenTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            color = BitwardenTheme.colorScheme.text.primary,
             textAlign = TextAlign.Center,
             modifier = Modifier
                 .fillMaxWidth()