diff options
| -rw-r--r-- | app/build.gradle.kts | 1 | ||||
| -rw-r--r-- | ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Type.kt | 21 | ||||
| -rw-r--r-- | ui-compose/src/main/res/font/manrope.xml (renamed from app/src/main/res/font/manrope.xml) | 0 | ||||
| -rw-r--r-- | ui-compose/src/main/res/font/manrope_bold.ttf (renamed from app/src/main/res/font/manrope_bold.ttf) | bin | 92228 -> 92228 bytes | |||
| -rw-r--r-- | ui-compose/src/main/res/font/manrope_extrabold.ttf (renamed from app/src/main/res/font/manrope_extrabold.ttf) | bin | 93144 -> 93144 bytes | |||
| -rw-r--r-- | ui-compose/src/main/res/font/manrope_extralight.ttf (renamed from app/src/main/res/font/manrope_extralight.ttf) | bin | 92272 -> 92272 bytes | |||
| -rw-r--r-- | ui-compose/src/main/res/font/manrope_light.ttf (renamed from app/src/main/res/font/manrope_light.ttf) | bin | 92400 -> 92400 bytes | |||
| -rw-r--r-- | ui-compose/src/main/res/font/manrope_medium.ttf (renamed from app/src/main/res/font/manrope_medium.ttf) | bin | 92464 -> 92464 bytes | |||
| -rw-r--r-- | ui-compose/src/main/res/font/manrope_regular.ttf (renamed from app/src/main/res/font/manrope_regular.ttf) | bin | 92376 -> 92376 bytes | |||
| -rw-r--r-- | ui-compose/src/main/res/font/manrope_semibold.ttf (renamed from app/src/main/res/font/manrope_semibold.ttf) | bin | 92380 -> 92380 bytes |
10 files changed, 11 insertions, 11 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c88370e4..77d3d1bf 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 3c256a6a..105fad1a 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 index c1ecac5c..c1ecac5c 100644 --- a/app/src/main/res/font/manrope.xml +++ b/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 Binary files differindex 8bbf0bd1..8bbf0bd1 100644 --- a/app/src/main/res/font/manrope_bold.ttf +++ b/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 Binary files differindex 3f68dffc..3f68dffc 100644 --- a/app/src/main/res/font/manrope_extrabold.ttf +++ b/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 Binary files differindex 9d21d775..9d21d775 100644 --- a/app/src/main/res/font/manrope_extralight.ttf +++ b/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 Binary files differindex f255257a..f255257a 100644 --- a/app/src/main/res/font/manrope_light.ttf +++ b/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 Binary files differindex c73d7741..c73d7741 100644 --- a/app/src/main/res/font/manrope_medium.ttf +++ b/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 Binary files differindex c02b01be..c02b01be 100644 --- a/app/src/main/res/font/manrope_regular.ttf +++ b/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 Binary files differindex 30ee0310..30ee0310 100644 --- a/app/src/main/res/font/manrope_semibold.ttf +++ b/ui-compose/src/main/res/font/manrope_semibold.ttf |