diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt index 57b987b..6b57ecb 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt @@ -2,12 +2,10 @@ package it.vfsfitvnm.vimusic.ui.styling import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.ExperimentalTextApi import androidx.compose.ui.text.PlatformTextStyle 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.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp import it.vfsfitvnm.vimusic.R @@ -21,7 +19,6 @@ data class Typography( val l: TextStyle, ) -@OptIn(ExperimentalTextApi::class) fun typographyOf(color: Color): Typography { val textStyle = TextStyle( fontFamily = FontFamily( @@ -33,11 +30,6 @@ fun typographyOf(color: Color): Typography { resId = R.font.poppins_w400, weight = FontWeight.Normal ), - Font( - resId = R.font.poppins_w400_italic, - weight = FontWeight.Normal, - style = FontStyle.Italic - ), Font( resId = R.font.poppins_w500, weight = FontWeight.Medium diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/TextStyle.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/TextStyle.kt index 92279b1..b8638de 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/TextStyle.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/TextStyle.kt @@ -17,9 +17,6 @@ fun TextStyle.align(align: TextAlign) = copy(textAlign = align) fun TextStyle.color(color: Color) = copy(color = color) -inline val TextStyle.italic: TextStyle - get() = style(FontStyle.Italic) - inline val TextStyle.medium: TextStyle get() = weight(FontWeight.Medium) @@ -36,8 +33,3 @@ inline val TextStyle.secondary: TextStyle @Composable @ReadOnlyComposable get() = color(LocalAppearance.current.colorPalette.textSecondary) - -inline val TextStyle.disabled: TextStyle - @Composable - @ReadOnlyComposable - get() = color(LocalAppearance.current.colorPalette.textDisabled) diff --git a/app/src/main/res/font/poppins_w400_italic.ttf b/app/src/main/res/font/poppins_w400_italic.ttf deleted file mode 100644 index 12b7b3c..0000000 Binary files a/app/src/main/res/font/poppins_w400_italic.ttf and /dev/null differ