mirror of
https://github.com/bitwarden/android.git
synced 2026-03-12 05:04:17 -05:00
[PM-21657] Migrate Typography to the ui module (#5198)
This commit is contained in:
@@ -53,7 +53,7 @@ fun BitwardenAccountActionItem(
|
||||
style = TextStyle(
|
||||
fontSize = 11.dp.toUnscaledTextUnit(),
|
||||
lineHeight = 13.dp.toUnscaledTextUnit(),
|
||||
fontFamily = FontFamily(Font(R.font.dm_sans_bold)),
|
||||
fontFamily = FontFamily(Font(com.bitwarden.ui.R.font.dm_sans_bold)),
|
||||
fontWeight = FontWeight.W600,
|
||||
),
|
||||
color = color.toSafeOverlayColor(),
|
||||
|
||||
@@ -27,9 +27,9 @@ import com.bitwarden.ui.platform.theme.color.lightBitwardenColorScheme
|
||||
import com.bitwarden.ui.platform.theme.color.toMaterialColorScheme
|
||||
import com.bitwarden.ui.platform.theme.shape.BitwardenShapes
|
||||
import com.bitwarden.ui.platform.theme.shape.bitwardenShapes
|
||||
import com.x8bit.bitwarden.ui.platform.theme.type.BitwardenTypography
|
||||
import com.x8bit.bitwarden.ui.platform.theme.type.bitwardenTypography
|
||||
import com.x8bit.bitwarden.ui.platform.theme.type.toMaterialTypography
|
||||
import com.bitwarden.ui.platform.theme.type.BitwardenTypography
|
||||
import com.bitwarden.ui.platform.theme.type.bitwardenTypography
|
||||
import com.bitwarden.ui.platform.theme.type.toMaterialTypography
|
||||
|
||||
/**
|
||||
* Static wrapper to make accessing the theme components easier.
|
||||
|
||||
@@ -46,6 +46,7 @@ dependencies {
|
||||
implementation(libs.androidx.compose.runtime)
|
||||
implementation(libs.androidx.compose.ui)
|
||||
implementation(libs.androidx.compose.ui.graphics)
|
||||
implementation(libs.androidx.compose.ui.tooling.preview)
|
||||
implementation(libs.androidx.navigation.compose)
|
||||
implementation(libs.kotlinx.serialization)
|
||||
implementation(libs.kotlinx.coroutines.core)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.x8bit.bitwarden.ui.platform.theme.type
|
||||
package com.bitwarden.ui.platform.theme.type
|
||||
|
||||
import androidx.compose.runtime.Immutable
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
@@ -1,10 +1,11 @@
|
||||
package com.x8bit.bitwarden.ui.platform.theme.type
|
||||
package com.bitwarden.ui.platform.theme.type
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.Typography
|
||||
import androidx.compose.runtime.Composable
|
||||
@@ -18,8 +19,7 @@ import androidx.compose.ui.text.style.LineHeightStyle
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.x8bit.bitwarden.R
|
||||
import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
|
||||
import com.bitwarden.ui.R
|
||||
|
||||
/**
|
||||
* The default [BitwardenTypography] for the app.
|
||||
@@ -279,7 +279,7 @@ fun BitwardenTypography.toMaterialTypography(): Typography = Typography(
|
||||
@Preview(showBackground = true)
|
||||
@Composable
|
||||
private fun BitwardenTypography_preview() {
|
||||
BitwardenTheme {
|
||||
MaterialTheme {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.padding(8.dp)
|
||||
Reference in New Issue
Block a user