From bea80163cea2130d9cd8511257562ba541b9f540 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 6 Jul 2022 22:19:01 +0530 Subject: ui-compose: import Manrope font --- app/build.gradle.kts | 1 + app/src/main/res/font/manrope.xml | 28 --------------------- app/src/main/res/font/manrope_bold.ttf | Bin 92228 -> 0 bytes app/src/main/res/font/manrope_extrabold.ttf | Bin 93144 -> 0 bytes app/src/main/res/font/manrope_extralight.ttf | Bin 92272 -> 0 bytes app/src/main/res/font/manrope_light.ttf | Bin 92400 -> 0 bytes app/src/main/res/font/manrope_medium.ttf | Bin 92464 -> 0 bytes app/src/main/res/font/manrope_regular.ttf | Bin 92376 -> 0 bytes app/src/main/res/font/manrope_semibold.ttf | Bin 92380 -> 0 bytes .../dev/msfjarvis/aps/ui/compose/theme/Type.kt | 21 ++++++++-------- ui-compose/src/main/res/font/manrope.xml | 28 +++++++++++++++++++++ ui-compose/src/main/res/font/manrope_bold.ttf | Bin 0 -> 92228 bytes ui-compose/src/main/res/font/manrope_extrabold.ttf | Bin 0 -> 93144 bytes .../src/main/res/font/manrope_extralight.ttf | Bin 0 -> 92272 bytes ui-compose/src/main/res/font/manrope_light.ttf | Bin 0 -> 92400 bytes ui-compose/src/main/res/font/manrope_medium.ttf | Bin 0 -> 92464 bytes ui-compose/src/main/res/font/manrope_regular.ttf | Bin 0 -> 92376 bytes ui-compose/src/main/res/font/manrope_semibold.ttf | Bin 0 -> 92380 bytes 18 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 app/src/main/res/font/manrope.xml delete mode 100644 app/src/main/res/font/manrope_bold.ttf delete mode 100644 app/src/main/res/font/manrope_extrabold.ttf delete mode 100644 app/src/main/res/font/manrope_extralight.ttf delete mode 100644 app/src/main/res/font/manrope_light.ttf delete mode 100644 app/src/main/res/font/manrope_medium.ttf delete mode 100644 app/src/main/res/font/manrope_regular.ttf delete mode 100644 app/src/main/res/font/manrope_semibold.ttf create mode 100644 ui-compose/src/main/res/font/manrope.xml create mode 100644 ui-compose/src/main/res/font/manrope_bold.ttf create mode 100644 ui-compose/src/main/res/font/manrope_extrabold.ttf create mode 100644 ui-compose/src/main/res/font/manrope_extralight.ttf create mode 100644 ui-compose/src/main/res/font/manrope_light.ttf create mode 100644 ui-compose/src/main/res/font/manrope_medium.ttf create mode 100644 ui-compose/src/main/res/font/manrope_regular.ttf create mode 100644 ui-compose/src/main/res/font/manrope_semibold.ttf 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/app/src/main/res/font/manrope.xml b/app/src/main/res/font/manrope.xml deleted file mode 100644 index c1ecac5c..00000000 --- a/app/src/main/res/font/manrope.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/font/manrope_bold.ttf b/app/src/main/res/font/manrope_bold.ttf deleted file mode 100644 index 8bbf0bd1..00000000 Binary files a/app/src/main/res/font/manrope_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/manrope_extrabold.ttf b/app/src/main/res/font/manrope_extrabold.ttf deleted file mode 100644 index 3f68dffc..00000000 Binary files a/app/src/main/res/font/manrope_extrabold.ttf and /dev/null differ diff --git a/app/src/main/res/font/manrope_extralight.ttf b/app/src/main/res/font/manrope_extralight.ttf deleted file mode 100644 index 9d21d775..00000000 Binary files a/app/src/main/res/font/manrope_extralight.ttf and /dev/null differ diff --git a/app/src/main/res/font/manrope_light.ttf b/app/src/main/res/font/manrope_light.ttf deleted file mode 100644 index f255257a..00000000 Binary files a/app/src/main/res/font/manrope_light.ttf and /dev/null differ diff --git a/app/src/main/res/font/manrope_medium.ttf b/app/src/main/res/font/manrope_medium.ttf deleted file mode 100644 index c73d7741..00000000 Binary files a/app/src/main/res/font/manrope_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/manrope_regular.ttf b/app/src/main/res/font/manrope_regular.ttf deleted file mode 100644 index c02b01be..00000000 Binary files a/app/src/main/res/font/manrope_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/manrope_semibold.ttf b/app/src/main/res/font/manrope_semibold.ttf deleted file mode 100644 index 30ee0310..00000000 Binary files a/app/src/main/res/font/manrope_semibold.ttf and /dev/null differ 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/ui-compose/src/main/res/font/manrope.xml b/ui-compose/src/main/res/font/manrope.xml new file mode 100644 index 00000000..c1ecac5c --- /dev/null +++ b/ui-compose/src/main/res/font/manrope.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + diff --git a/ui-compose/src/main/res/font/manrope_bold.ttf b/ui-compose/src/main/res/font/manrope_bold.ttf new file mode 100644 index 00000000..8bbf0bd1 Binary files /dev/null and b/ui-compose/src/main/res/font/manrope_bold.ttf differ diff --git a/ui-compose/src/main/res/font/manrope_extrabold.ttf b/ui-compose/src/main/res/font/manrope_extrabold.ttf new file mode 100644 index 00000000..3f68dffc Binary files /dev/null and b/ui-compose/src/main/res/font/manrope_extrabold.ttf differ diff --git a/ui-compose/src/main/res/font/manrope_extralight.ttf b/ui-compose/src/main/res/font/manrope_extralight.ttf new file mode 100644 index 00000000..9d21d775 Binary files /dev/null and b/ui-compose/src/main/res/font/manrope_extralight.ttf differ diff --git a/ui-compose/src/main/res/font/manrope_light.ttf b/ui-compose/src/main/res/font/manrope_light.ttf new file mode 100644 index 00000000..f255257a Binary files /dev/null and b/ui-compose/src/main/res/font/manrope_light.ttf differ diff --git a/ui-compose/src/main/res/font/manrope_medium.ttf b/ui-compose/src/main/res/font/manrope_medium.ttf new file mode 100644 index 00000000..c73d7741 Binary files /dev/null and b/ui-compose/src/main/res/font/manrope_medium.ttf differ diff --git a/ui-compose/src/main/res/font/manrope_regular.ttf b/ui-compose/src/main/res/font/manrope_regular.ttf new file mode 100644 index 00000000..c02b01be Binary files /dev/null and b/ui-compose/src/main/res/font/manrope_regular.ttf differ diff --git a/ui-compose/src/main/res/font/manrope_semibold.ttf b/ui-compose/src/main/res/font/manrope_semibold.ttf new file mode 100644 index 00000000..30ee0310 Binary files /dev/null and b/ui-compose/src/main/res/font/manrope_semibold.ttf differ -- cgit v1.2.3