mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-16 11:18:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

PM-12322: Add bitwarden color scheme to BitwardenTheme (#4000)

Browse source
This commit is contained in:
David Perez 2024-09-30 16:47:08 -05:00 • committed by GitHub
parent 8ec743736a
commit 10bbab971f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt
View file

@ -15,6 +15,7 @@ import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.ProvidableCompositionLocal
import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.ui.graphics.Color
@ -23,10 +24,28 @@ import androidx.compose.ui.platform.LocalView
import androidx.core.view.WindowCompat
import com.x8bit.bitwarden.R
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
/**
* Static wrapper to make accessing the theme components easier.
*/
object BitwardenTheme {
/**
* Retrieves the current [BitwardenColorScheme].
*/
val colorScheme: BitwardenColorScheme
@Composable
@ReadOnlyComposable
get() = LocalBitwardenColorScheme.current
}
/**
* The overall application theme. This can be configured to support a [theme] and [dynamicColor].
*/
@Suppress("CyclomaticComplexMethod")
@Composable
fun BitwardenTheme(
theme: AppTheme = AppTheme.DEFAULT,
@ -49,6 +68,21 @@ fun BitwardenTheme(
darkTheme -> darkColorScheme(context)
else -> lightColorScheme(context)
}
val bitwardenColorScheme = when {
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
dynamicBitwardenColorScheme(
materialColorScheme = if (darkTheme) {
dynamicDarkColorScheme(context = context)
} else {
dynamicLightColorScheme(context = context)
},
isDarkTheme = darkTheme,
)
}
darkTheme -> darkBitwardenColorScheme
else -> lightBitwardenColorScheme
}
// Update status bar according to scheme
val view = LocalView.current
@ -70,6 +104,7 @@ fun BitwardenTheme(
}
CompositionLocalProvider(
LocalBitwardenColorScheme provides bitwardenColorScheme,
LocalNonMaterialColors provides nonMaterialColors,
LocalNonMaterialTypography provides nonMaterialTypography,
) {
@ -205,3 +240,9 @@ private fun darkNonMaterialColors(context: Context): NonMaterialColors =
passwordStrong = R.color.dark_password_strength_strong.toColor(context),
qrCodeClickableText = R.color.qr_code_clickable_text.toColor(context),
)
/**
* Provides access to the Bitwarden colors throughout the app.
*/
val LocalBitwardenColorScheme: ProvidableCompositionLocal<BitwardenColorScheme> =
compositionLocalOf { lightBitwardenColorScheme }