[PM-21365] Migrate BitwardenColorScheme to ui module (#5158)

This commit is contained in:
Patrick Honkonen
2025-05-08 19:48:51 +00:00
committed by GitHub
parent 0d0b8d6780
commit 564304616d
4 changed files with 4 additions and 3 deletions
@@ -5,12 +5,12 @@ import android.widget.RemoteViews
import androidx.annotation.DrawableRes
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import com.bitwarden.ui.platform.theme.color.BitwardenColorScheme
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo
import com.x8bit.bitwarden.data.autofill.model.AutofillCipher
import com.x8bit.bitwarden.ui.autofill.util.getAutofillSuggestionContentDescription
import com.x8bit.bitwarden.ui.autofill.util.isSystemDarkMode
import com.x8bit.bitwarden.ui.platform.theme.color.BitwardenColorScheme
import com.x8bit.bitwarden.ui.platform.theme.color.darkBitwardenColorScheme
import com.x8bit.bitwarden.ui.platform.theme.color.lightBitwardenColorScheme
@@ -18,9 +18,9 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalView
import androidx.core.graphics.drawable.toDrawable
import androidx.core.view.WindowCompat
import com.bitwarden.ui.platform.theme.color.BitwardenColorScheme
import com.x8bit.bitwarden.ui.platform.components.field.interceptor.IncognitoInput
import com.x8bit.bitwarden.ui.platform.feature.settings.appearance.model.AppTheme
import com.x8bit.bitwarden.ui.platform.theme.color.BitwardenColorScheme
import com.x8bit.bitwarden.ui.platform.theme.color.darkBitwardenColorScheme
import com.x8bit.bitwarden.ui.platform.theme.color.dynamicBitwardenColorScheme
import com.x8bit.bitwarden.ui.platform.theme.color.lightBitwardenColorScheme
@@ -1,137 +0,0 @@
package com.x8bit.bitwarden.ui.platform.theme.color
import androidx.compose.runtime.Immutable
import androidx.compose.ui.graphics.Color
/**
* Defines all the colors for the app.
*/
@Immutable
data class BitwardenColorScheme(
val text: TextColors,
val background: BackgroundColors,
val stroke: StrokeColors,
val icon: IconColors,
val filledButton: FilledButtonColors,
val outlineButton: OutlineButtonColors,
val toggleButton: ToggleButtonColors,
val sliderButton: SliderButtonColors,
val status: StatusColors,
val illustration: IllustrationColors,
) {
/**
* Defines all the text colors for the app.
*/
@Immutable
data class TextColors(
val primary: Color,
val secondary: Color,
val interaction: Color,
val reversed: Color,
val codePink: Color,
val codeBlue: Color,
)
/**
* Defines all the background colors for the app.
*/
@Immutable
data class BackgroundColors(
val primary: Color,
val secondary: Color,
val tertiary: Color,
val alert: Color,
val scrim: Color,
val pressed: Color,
)
/**
* Defines all the stroke colors for the app.
*/
@Immutable
data class StrokeColors(
val divider: Color,
val border: Color,
val segmentedNav: Color,
)
/**
* Defines all the icons colors for the app.
*/
@Immutable
data class IconColors(
val primary: Color,
val secondary: Color,
val reversed: Color,
val badgeBackground: Color,
val badgeForeground: Color,
)
/**
* Defines all the filled button colors for the app.
*/
@Immutable
data class FilledButtonColors(
val background: Color,
val backgroundDisabled: Color,
val backgroundReversed: Color,
val foreground: Color,
val foregroundDisabled: Color,
val foregroundReversed: Color,
)
/**
* Defines all the outline button colors for the app.
*/
@Immutable
data class OutlineButtonColors(
val border: Color,
val borderDisabled: Color,
val borderReversed: Color,
val foreground: Color,
val foregroundDisabled: Color,
val foregroundReversed: Color,
)
/**
* Defines all the toggle colors for the app.
*/
@Immutable
data class ToggleButtonColors(
val backgroundOn: Color,
val backgroundOff: Color,
val switch: Color,
)
/**
* Defines all the slider colors for the app.
*/
@Immutable
data class SliderButtonColors(
val knobBackground: Color,
val knobLabel: Color,
val filled: Color,
val unfilled: Color,
)
/**
* Defines all the status colors for the app.
*/
@Immutable
data class StatusColors(
val strong: Color,
val good: Color,
val weak1: Color,
val weak2: Color,
val error: Color,
)
/**
* Defines all the illustration colors for the app.
*/
@Immutable
data class IllustrationColors(
val outline: Color,
val backgroundPrimary: Color,
)
}
@@ -2,6 +2,7 @@ package com.x8bit.bitwarden.ui.platform.theme.color
import androidx.compose.material3.ColorScheme
import androidx.compose.ui.graphics.Color
import com.bitwarden.ui.platform.theme.color.BitwardenColorScheme
/**
* The default [BitwardenColorScheme] for dark mode.