Replace font with Montserrat

siper · Jun 5, 2024 · ee83667 · ee83667
1 parent 494a4c2
commit ee83667
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 7 deletions.
diff --git a/core/ui/src/main/java/ru/stersh/youamp/core/ui/Type.kt b/core/ui/src/main/java/ru/stersh/youamp/core/ui/Type.kt
@@ -6,15 +6,15 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 
-private val PoppingFontFamily = FontFamily(
-    Font(R.font.poppins_light, FontWeight.Light),
-    Font(R.font.poppins_regular, FontWeight.Normal),
-    Font(R.font.poppins_italic, FontWeight.Normal, FontStyle.Italic),
-    Font(R.font.poppins_medium, FontWeight.Medium),
-    Font(R.font.poppins_bold, FontWeight.Bold)
+private val MontserratFontFamily = FontFamily(
+    Font(R.font.montserrat_light, FontWeight.Light),
+    Font(R.font.montserrat_regular, FontWeight.Normal),
+    Font(R.font.montserrat_italic, FontWeight.Normal, FontStyle.Italic),
+    Font(R.font.montserrat_medium, FontWeight.Medium),
+    Font(R.font.montserrat_bold, FontWeight.Bold)
 )
 
-val Typography = Typography().defaultFontFamily(fontFamily = PoppingFontFamily)
+val Typography = Typography().defaultFontFamily(fontFamily = MontserratFontFamily)
 
 private fun Typography.defaultFontFamily(fontFamily: FontFamily): Typography {
     return this.copy(

diff --git a/core/ui/src/main/res/font/montserrat_bold.ttf b/core/ui/src/main/res/font/montserrat_bold.ttf
diff --git a/core/ui/src/main/res/font/montserrat_italic.ttf b/core/ui/src/main/res/font/montserrat_italic.ttf
diff --git a/core/ui/src/main/res/font/montserrat_light.ttf b/core/ui/src/main/res/font/montserrat_light.ttf
diff --git a/core/ui/src/main/res/font/montserrat_medium.ttf b/core/ui/src/main/res/font/montserrat_medium.ttf
diff --git a/core/ui/src/main/res/font/montserrat_regular.ttf b/core/ui/src/main/res/font/montserrat_regular.ttf
diff --git a/core/ui/src/main/res/font/poppins_bold.ttf b/core/ui/src/main/res/font/poppins_bold.ttf
diff --git a/core/ui/src/main/res/font/poppins_italic.ttf b/core/ui/src/main/res/font/poppins_italic.ttf
diff --git a/core/ui/src/main/res/font/poppins_light.ttf b/core/ui/src/main/res/font/poppins_light.ttf
diff --git a/core/ui/src/main/res/font/poppins_medium.ttf b/core/ui/src/main/res/font/poppins_medium.ttf
diff --git a/core/ui/src/main/res/font/poppins_regular.ttf b/core/ui/src/main/res/font/poppins_regular.ttf