aboutsummaryrefslogtreecommitdiff
path: root/ui-compose
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2022-07-06 22:19:01 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2022-07-07 11:28:59 +0530
commitbea80163cea2130d9cd8511257562ba541b9f540 (patch)
tree6beeb2cf6428855f84630a98a8e9685cccd8b69e /ui-compose
parent91f29f6a4036520a30439a1e9ffdac503d93b948 (diff)
ui-compose: import Manrope font
Diffstat (limited to 'ui-compose')
-rw-r--r--ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Type.kt21
-rw-r--r--ui-compose/src/main/res/font/manrope.xml28
-rw-r--r--ui-compose/src/main/res/font/manrope_bold.ttfbin0 -> 92228 bytes
-rw-r--r--ui-compose/src/main/res/font/manrope_extrabold.ttfbin0 -> 93144 bytes
-rw-r--r--ui-compose/src/main/res/font/manrope_extralight.ttfbin0 -> 92272 bytes
-rw-r--r--ui-compose/src/main/res/font/manrope_light.ttfbin0 -> 92400 bytes
-rw-r--r--ui-compose/src/main/res/font/manrope_medium.ttfbin0 -> 92464 bytes
-rw-r--r--ui-compose/src/main/res/font/manrope_regular.ttfbin0 -> 92376 bytes
-rw-r--r--ui-compose/src/main/res/font/manrope_semibold.ttfbin0 -> 92380 bytes
9 files changed, 38 insertions, 11 deletions
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 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
+ ~ SPDX-License-Identifier: GPL-3.0-only
+ -->
+
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+ <font
+ app:font="@font/manrope_extralight"
+ app:fontWeight="200" />
+ <font
+ app:font="@font/manrope_light"
+ app:fontWeight="300" />
+ <font
+ app:font="@font/manrope_regular"
+ app:fontWeight="400" />
+ <font
+ app:font="@font/manrope_medium"
+ app:fontWeight="500" />
+ <font
+ app:font="@font/manrope_semibold"
+ app:fontWeight="600" />
+ <font
+ app:font="@font/manrope_bold"
+ app:fontWeight="700" />
+ <font
+ app:font="@font/manrope_extrabold"
+ app:fontWeight="800" />
+</font-family>
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
--- /dev/null
+++ b/ui-compose/src/main/res/font/manrope_bold.ttf
Binary files 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
--- /dev/null
+++ b/ui-compose/src/main/res/font/manrope_extrabold.ttf
Binary files 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
--- /dev/null
+++ b/ui-compose/src/main/res/font/manrope_extralight.ttf
Binary files 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
--- /dev/null
+++ b/ui-compose/src/main/res/font/manrope_light.ttf
Binary files 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
--- /dev/null
+++ b/ui-compose/src/main/res/font/manrope_medium.ttf
Binary files 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
--- /dev/null
+++ b/ui-compose/src/main/res/font/manrope_regular.ttf
Binary files 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
--- /dev/null
+++ b/ui-compose/src/main/res/font/manrope_semibold.ttf
Binary files differ