diff --git a/app/src/main/java/chat/revolt/ui/theme/Typography.kt b/app/src/main/java/chat/revolt/ui/theme/Typography.kt index e5f228c5..663268b5 100644 --- a/app/src/main/java/chat/revolt/ui/theme/Typography.kt +++ b/app/src/main/java/chat/revolt/ui/theme/Typography.kt @@ -5,7 +5,6 @@ import androidx.compose.ui.text.TextStyle import chat.revolt.R import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp @@ -21,23 +20,6 @@ private val Inter = FontFamily( Font(R.font.inter_black, FontWeight.Black), ) -const val ALL_INTER = true - -private val OpenSans = if (ALL_INTER) Inter else FontFamily( - Font(R.font.opensans_light, FontWeight.Light, FontStyle.Normal), - Font(R.font.opensans_lightitalic, FontWeight.Light, FontStyle.Italic), - Font(R.font.opensans_regular, FontWeight.Normal, FontStyle.Normal), - Font(R.font.opensans_regularitalic, FontWeight.Normal, FontStyle.Italic), - Font(R.font.opensans_medium, FontWeight.Medium, FontStyle.Normal), - Font(R.font.opensans_mediumitalic, FontWeight.Medium, FontStyle.Italic), - Font(R.font.opensans_semibold, FontWeight.SemiBold, FontStyle.Normal), - Font(R.font.opensans_semibolditalic, FontWeight.SemiBold, FontStyle.Italic), - Font(R.font.opensans_bold, FontWeight.Bold, FontStyle.Normal), - Font(R.font.opensans_bolditalic, FontWeight.Bold, FontStyle.Italic), - Font(R.font.opensans_extrabold, FontWeight.ExtraBold, FontStyle.Normal), - Font(R.font.opensans_extrabolditalic, FontWeight.ExtraBold, FontStyle.Italic), -) - val RevoltTypography = Typography( displayLarge = TextStyle( fontFamily = Inter, @@ -56,65 +38,65 @@ val RevoltTypography = Typography( ), headlineLarge = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.SemiBold, fontSize = 32.sp ), headlineMedium = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.SemiBold, fontSize = 28.sp ), headlineSmall = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Medium, fontSize = 24.sp ), titleLarge = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Normal, fontSize = 22.sp ), titleMedium = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Medium, fontSize = 16.sp ), titleSmall = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Medium, fontSize = 14.sp ), labelLarge = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Medium, fontSize = 14.sp ), labelMedium = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Medium, fontSize = 12.sp ), labelSmall = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Medium, fontSize = 11.sp ), bodyLarge = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Normal, fontSize = 16.sp ), bodyMedium = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Normal, fontSize = 14.sp ), bodySmall = TextStyle( - fontFamily = OpenSans, + fontFamily = Inter, fontWeight = FontWeight.Normal, fontSize = 12.sp ) diff --git a/app/src/main/res/font/opensans_bold.ttf b/app/src/main/res/font/opensans_bold.ttf deleted file mode 100644 index a1398b33..00000000 Binary files a/app/src/main/res/font/opensans_bold.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_bolditalic.ttf b/app/src/main/res/font/opensans_bolditalic.ttf deleted file mode 100644 index 307122c1..00000000 Binary files a/app/src/main/res/font/opensans_bolditalic.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_extrabold.ttf b/app/src/main/res/font/opensans_extrabold.ttf deleted file mode 100644 index 08d7185f..00000000 Binary files a/app/src/main/res/font/opensans_extrabold.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_extrabolditalic.ttf b/app/src/main/res/font/opensans_extrabolditalic.ttf deleted file mode 100644 index c35f57f4..00000000 Binary files a/app/src/main/res/font/opensans_extrabolditalic.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_light.ttf b/app/src/main/res/font/opensans_light.ttf deleted file mode 100644 index d9a9e277..00000000 Binary files a/app/src/main/res/font/opensans_light.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_lightitalic.ttf b/app/src/main/res/font/opensans_lightitalic.ttf deleted file mode 100644 index 77f2e6c0..00000000 Binary files a/app/src/main/res/font/opensans_lightitalic.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_medium.ttf b/app/src/main/res/font/opensans_medium.ttf deleted file mode 100644 index ba6db9b7..00000000 Binary files a/app/src/main/res/font/opensans_medium.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_mediumitalic.ttf b/app/src/main/res/font/opensans_mediumitalic.ttf deleted file mode 100644 index 980ac257..00000000 Binary files a/app/src/main/res/font/opensans_mediumitalic.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_regular.ttf b/app/src/main/res/font/opensans_regular.ttf deleted file mode 100644 index 1dc226dd..00000000 Binary files a/app/src/main/res/font/opensans_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_regularitalic.ttf b/app/src/main/res/font/opensans_regularitalic.ttf deleted file mode 100644 index 790286fe..00000000 Binary files a/app/src/main/res/font/opensans_regularitalic.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_semibold.ttf b/app/src/main/res/font/opensans_semibold.ttf deleted file mode 100644 index 66acb207..00000000 Binary files a/app/src/main/res/font/opensans_semibold.ttf and /dev/null differ diff --git a/app/src/main/res/font/opensans_semibolditalic.ttf b/app/src/main/res/font/opensans_semibolditalic.ttf deleted file mode 100644 index f8c39f95..00000000 Binary files a/app/src/main/res/font/opensans_semibolditalic.ttf and /dev/null differ