diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c88370e46..77d3d1bfa 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -50,6 +50,7 @@ dependencies { implementation(projects.openpgpKtx) implementation(projects.passgen.diceware) implementation(projects.passgen.random) + implementation(projects.uiCompose) implementation(libs.androidx.activity.ktx) implementation(libs.androidx.appcompat) implementation(libs.androidx.autofill) diff --git a/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Type.kt b/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Type.kt index 3c256a6a1..105fad1ab 100644 --- a/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Type.kt +++ b/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Type.kt @@ -2,23 +2,22 @@ package dev.msfjarvis.aps.ui.compose.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp +import dev.msfjarvis.aps.ui.compose.R -/** Uncomment the contents below if and when the font files get moved to this module. */ internal val Manrope = FontFamily( - /* - Font(R.font.manrope_bold, FontWeight.Bold), - Font(R.font.manrope_extrabold, FontWeight.ExtraBold), - Font(R.font.manrope_extralight, FontWeight.ExtraLight), - Font(R.font.manrope_light, FontWeight.Light), - Font(R.font.manrope_medium, FontWeight.Medium), - Font(R.font.manrope_regular, FontWeight.Normal), - Font(R.font.manrope_semibold, FontWeight.SemiBold), - */ - ) + Font(R.font.manrope_bold, FontWeight.Bold), + Font(R.font.manrope_extrabold, FontWeight.ExtraBold), + Font(R.font.manrope_extralight, FontWeight.ExtraLight), + Font(R.font.manrope_light, FontWeight.Light), + Font(R.font.manrope_medium, FontWeight.Medium), + Font(R.font.manrope_regular, FontWeight.Normal), + Font(R.font.manrope_semibold, FontWeight.SemiBold), + ) internal val AppTypography = Typography( diff --git a/app/src/main/res/font/manrope.xml b/ui-compose/src/main/res/font/manrope.xml similarity index 100% rename from app/src/main/res/font/manrope.xml rename to ui-compose/src/main/res/font/manrope.xml diff --git a/app/src/main/res/font/manrope_bold.ttf b/ui-compose/src/main/res/font/manrope_bold.ttf similarity index 100% rename from app/src/main/res/font/manrope_bold.ttf rename to ui-compose/src/main/res/font/manrope_bold.ttf diff --git a/app/src/main/res/font/manrope_extrabold.ttf b/ui-compose/src/main/res/font/manrope_extrabold.ttf similarity index 100% rename from app/src/main/res/font/manrope_extrabold.ttf rename to ui-compose/src/main/res/font/manrope_extrabold.ttf diff --git a/app/src/main/res/font/manrope_extralight.ttf b/ui-compose/src/main/res/font/manrope_extralight.ttf similarity index 100% rename from app/src/main/res/font/manrope_extralight.ttf rename to ui-compose/src/main/res/font/manrope_extralight.ttf diff --git a/app/src/main/res/font/manrope_light.ttf b/ui-compose/src/main/res/font/manrope_light.ttf similarity index 100% rename from app/src/main/res/font/manrope_light.ttf rename to ui-compose/src/main/res/font/manrope_light.ttf diff --git a/app/src/main/res/font/manrope_medium.ttf b/ui-compose/src/main/res/font/manrope_medium.ttf similarity index 100% rename from app/src/main/res/font/manrope_medium.ttf rename to ui-compose/src/main/res/font/manrope_medium.ttf diff --git a/app/src/main/res/font/manrope_regular.ttf b/ui-compose/src/main/res/font/manrope_regular.ttf similarity index 100% rename from app/src/main/res/font/manrope_regular.ttf rename to ui-compose/src/main/res/font/manrope_regular.ttf diff --git a/app/src/main/res/font/manrope_semibold.ttf b/ui-compose/src/main/res/font/manrope_semibold.ttf similarity index 100% rename from app/src/main/res/font/manrope_semibold.ttf rename to ui-compose/src/main/res/font/manrope_semibold.ttf