From 27a9fc52b7e2df2e36dc551281461c7007b89af1 Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Thu, 15 May 2025 11:55:51 -0400 Subject: [PATCH] [PM-21657] Migrate Typography to the `ui` module (#5198) --- .../account/BitwardenAccountActionItem.kt | 2 +- .../bitwarden/ui/platform/theme/BitwardenTheme.kt | 6 +++--- ui/build.gradle.kts | 1 + .../ui/platform/theme/type/BitwardenTypography.kt | 2 +- .../bitwarden/ui/platform/theme/type/Typography.kt | 8 ++++---- {app => ui}/src/main/res/font/dm_sans_bold.ttf | Bin {app => ui}/src/main/res/font/dm_sans_medium.ttf | Bin {app => ui}/src/main/res/font/dm_sans_regular.ttf | Bin {app => ui}/src/main/res/font/dm_sans_semi_bold.ttf | Bin .../src/main/res/font/roboto_regular_mono.ttf | Bin 10 files changed, 10 insertions(+), 9 deletions(-) rename {app/src/main/java/com/x8bit => ui/src/main/java/com}/bitwarden/ui/platform/theme/type/BitwardenTypography.kt (94%) rename {app/src/main/java/com/x8bit => ui/src/main/java/com}/bitwarden/ui/platform/theme/type/Typography.kt (98%) rename {app => ui}/src/main/res/font/dm_sans_bold.ttf (100%) rename {app => ui}/src/main/res/font/dm_sans_medium.ttf (100%) rename {app => ui}/src/main/res/font/dm_sans_regular.ttf (100%) rename {app => ui}/src/main/res/font/dm_sans_semi_bold.ttf (100%) rename {app => ui}/src/main/res/font/roboto_regular_mono.ttf (100%) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt index fdb9264c57..b149245412 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/account/BitwardenAccountActionItem.kt @@ -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(), diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt index a13e1ebad2..c1c984606f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/BitwardenTheme.kt @@ -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. diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index 312c86a432..2953893996 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -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) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/type/BitwardenTypography.kt b/ui/src/main/java/com/bitwarden/ui/platform/theme/type/BitwardenTypography.kt similarity index 94% rename from app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/type/BitwardenTypography.kt rename to ui/src/main/java/com/bitwarden/ui/platform/theme/type/BitwardenTypography.kt index 6054b04707..988835e976 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/type/BitwardenTypography.kt +++ b/ui/src/main/java/com/bitwarden/ui/platform/theme/type/BitwardenTypography.kt @@ -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 diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/type/Typography.kt b/ui/src/main/java/com/bitwarden/ui/platform/theme/type/Typography.kt similarity index 98% rename from app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/type/Typography.kt rename to ui/src/main/java/com/bitwarden/ui/platform/theme/type/Typography.kt index 4c0d660932..598da76543 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/type/Typography.kt +++ b/ui/src/main/java/com/bitwarden/ui/platform/theme/type/Typography.kt @@ -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) diff --git a/app/src/main/res/font/dm_sans_bold.ttf b/ui/src/main/res/font/dm_sans_bold.ttf similarity index 100% rename from app/src/main/res/font/dm_sans_bold.ttf rename to ui/src/main/res/font/dm_sans_bold.ttf diff --git a/app/src/main/res/font/dm_sans_medium.ttf b/ui/src/main/res/font/dm_sans_medium.ttf similarity index 100% rename from app/src/main/res/font/dm_sans_medium.ttf rename to ui/src/main/res/font/dm_sans_medium.ttf diff --git a/app/src/main/res/font/dm_sans_regular.ttf b/ui/src/main/res/font/dm_sans_regular.ttf similarity index 100% rename from app/src/main/res/font/dm_sans_regular.ttf rename to ui/src/main/res/font/dm_sans_regular.ttf diff --git a/app/src/main/res/font/dm_sans_semi_bold.ttf b/ui/src/main/res/font/dm_sans_semi_bold.ttf similarity index 100% rename from app/src/main/res/font/dm_sans_semi_bold.ttf rename to ui/src/main/res/font/dm_sans_semi_bold.ttf diff --git a/app/src/main/res/font/roboto_regular_mono.ttf b/ui/src/main/res/font/roboto_regular_mono.ttf similarity index 100% rename from app/src/main/res/font/roboto_regular_mono.ttf rename to ui/src/main/res/font/roboto_regular_mono.ttf