From bea80163cea2130d9cd8511257562ba541b9f540 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
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
 9 files changed, 1 insertion(+), 28 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

(limited to 'app')

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 @@
-<?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/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
-- 
cgit v1.2.3