From f39276875d0f84033ffbc3100da268db01dc56b0 Mon Sep 17 00:00:00 2001
From: vfsfitvnm <vfsfitvnm@protonmail.com>
Date: Sat, 11 Jun 2022 19:05:32 +0200
Subject: [PATCH] Remove includeFontPadding deprecation

---
 app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt    | 2 --
 .../kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt   | 2 --
 .../kotlin/it/vfsfitvnm/vimusic/ui/styling/Typography.kt    | 6 +-----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt
index 5d3f0af..24d63de 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt
@@ -27,7 +27,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalHapticFeedback
-import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.compose.ui.unit.dp
 import androidx.media3.session.MediaController
 import androidx.media3.session.SessionToken
@@ -50,7 +49,6 @@ import it.vfsfitvnm.vimusic.utils.*
 
 @ExperimentalAnimationApi
 @ExperimentalFoundationApi
-@ExperimentalTextApi
 class MainActivity : ComponentActivity() {
     private lateinit var mediaControllerFuture: ListenableFuture<MediaController>
 
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt
index 15f34c0..05313de 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt
@@ -14,7 +14,6 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.ui.text.ExperimentalTextApi
 import androidx.core.app.NotificationCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.drawable.toBitmap
@@ -53,7 +52,6 @@ import kotlin.math.roundToInt
 
 @ExperimentalAnimationApi
 @ExperimentalFoundationApi
-@ExperimentalTextApi
 class PlayerService : MediaSessionService(), MediaSession.MediaItemFiller,
     MediaNotification.Provider,
     PlaybackStatsListener.Callback, Player.Listener,YoutubePlayer.Radio.Listener {
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 e369c15..692f617 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
@@ -5,8 +5,6 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
 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
@@ -26,7 +24,6 @@ data class Typography(
 
 val LocalTypography = staticCompositionLocalOf<Typography> { TODO() }
 
-@ExperimentalTextApi
 @Composable
 fun rememberTypography(color: Color): Typography {
     return remember(color) {
@@ -59,8 +56,7 @@ fun rememberTypography(color: Color): Typography {
                 ),
             ),
             fontWeight = FontWeight.Normal,
-            color = color,
-            platformStyle = PlatformTextStyle(includeFontPadding = false)
+            color = color
         ).run {
             Typography(
                 xxs = copy(fontSize = 12.sp),