Remove includeFontPadding deprecation
This commit is contained in:
@@ -27,7 +27,6 @@ import androidx.compose.ui.Alignment
|
|||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import androidx.compose.ui.platform.LocalHapticFeedback
|
import androidx.compose.ui.platform.LocalHapticFeedback
|
||||||
import androidx.compose.ui.text.ExperimentalTextApi
|
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import androidx.media3.session.MediaController
|
import androidx.media3.session.MediaController
|
||||||
import androidx.media3.session.SessionToken
|
import androidx.media3.session.SessionToken
|
||||||
@@ -50,7 +49,6 @@ import it.vfsfitvnm.vimusic.utils.*
|
|||||||
|
|
||||||
@ExperimentalAnimationApi
|
@ExperimentalAnimationApi
|
||||||
@ExperimentalFoundationApi
|
@ExperimentalFoundationApi
|
||||||
@ExperimentalTextApi
|
|
||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
private lateinit var mediaControllerFuture: ListenableFuture<MediaController>
|
private lateinit var mediaControllerFuture: ListenableFuture<MediaController>
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import androidx.annotation.DrawableRes
|
|||||||
import androidx.annotation.StringRes
|
import androidx.annotation.StringRes
|
||||||
import androidx.compose.animation.ExperimentalAnimationApi
|
import androidx.compose.animation.ExperimentalAnimationApi
|
||||||
import androidx.compose.foundation.ExperimentalFoundationApi
|
import androidx.compose.foundation.ExperimentalFoundationApi
|
||||||
import androidx.compose.ui.text.ExperimentalTextApi
|
|
||||||
import androidx.core.app.NotificationCompat
|
import androidx.core.app.NotificationCompat
|
||||||
import androidx.core.graphics.drawable.IconCompat
|
import androidx.core.graphics.drawable.IconCompat
|
||||||
import androidx.core.graphics.drawable.toBitmap
|
import androidx.core.graphics.drawable.toBitmap
|
||||||
@@ -53,7 +52,6 @@ import kotlin.math.roundToInt
|
|||||||
|
|
||||||
@ExperimentalAnimationApi
|
@ExperimentalAnimationApi
|
||||||
@ExperimentalFoundationApi
|
@ExperimentalFoundationApi
|
||||||
@ExperimentalTextApi
|
|
||||||
class PlayerService : MediaSessionService(), MediaSession.MediaItemFiller,
|
class PlayerService : MediaSessionService(), MediaSession.MediaItemFiller,
|
||||||
MediaNotification.Provider,
|
MediaNotification.Provider,
|
||||||
PlaybackStatsListener.Callback, Player.Listener,YoutubePlayer.Radio.Listener {
|
PlaybackStatsListener.Callback, Player.Listener,YoutubePlayer.Radio.Listener {
|
||||||
|
|||||||
@@ -5,8 +5,6 @@ import androidx.compose.runtime.Immutable
|
|||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.runtime.staticCompositionLocalOf
|
import androidx.compose.runtime.staticCompositionLocalOf
|
||||||
import androidx.compose.ui.graphics.Color
|
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.TextStyle
|
||||||
import androidx.compose.ui.text.font.Font
|
import androidx.compose.ui.text.font.Font
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
import androidx.compose.ui.text.font.FontFamily
|
||||||
@@ -26,7 +24,6 @@ data class Typography(
|
|||||||
|
|
||||||
val LocalTypography = staticCompositionLocalOf<Typography> { TODO() }
|
val LocalTypography = staticCompositionLocalOf<Typography> { TODO() }
|
||||||
|
|
||||||
@ExperimentalTextApi
|
|
||||||
@Composable
|
@Composable
|
||||||
fun rememberTypography(color: Color): Typography {
|
fun rememberTypography(color: Color): Typography {
|
||||||
return remember(color) {
|
return remember(color) {
|
||||||
@@ -59,8 +56,7 @@ fun rememberTypography(color: Color): Typography {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
fontWeight = FontWeight.Normal,
|
fontWeight = FontWeight.Normal,
|
||||||
color = color,
|
color = color
|
||||||
platformStyle = PlatformTextStyle(includeFontPadding = false)
|
|
||||||
).run {
|
).run {
|
||||||
Typography(
|
Typography(
|
||||||
xxs = copy(fontSize = 12.sp),
|
xxs = copy(fontSize = 12.sp),
|
||||||
|
|||||||
Reference in New Issue
Block a user