Skip to content

Commit 2f30f82

Browse files
Fix Jetcaster issues after upgrading compileSdk to 35
1 parent 1abaa82 commit 2f30f82

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import androidx.compose.material.icons.Icons
2727
import androidx.compose.material.icons.filled.Check
2828
import androidx.compose.material3.ExperimentalMaterial3Api
2929
import androidx.compose.material3.Icon
30-
import androidx.compose.material3.LocalMinimumInteractiveComponentEnforcement
30+
import androidx.compose.material3.LocalMinimumInteractiveComponentSize
3131
import androidx.compose.material3.MaterialTheme
3232
import androidx.compose.material3.ScrollableTabRow
3333
import androidx.compose.material3.Surface
@@ -39,6 +39,7 @@ import androidx.compose.ui.Alignment
3939
import androidx.compose.ui.Modifier
4040
import androidx.compose.ui.graphics.Color
4141
import androidx.compose.ui.res.stringResource
42+
import androidx.compose.ui.unit.Dp
4243
import androidx.compose.ui.unit.dp
4344
import com.example.jetcaster.R
4445
import com.example.jetcaster.core.model.CategoryInfo
@@ -162,7 +163,7 @@ private fun ChoiceChipContent(
162163
// When adding onClick to Surface, it automatically makes this item higher.
163164
// On the other hand, adding .clickable modifier, doesn't use the same shape as Surface.
164165
// This way we disable the minimum height requirement
165-
CompositionLocalProvider(value = LocalMinimumInteractiveComponentEnforcement provides false) {
166+
CompositionLocalProvider(value = LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
166167
Surface(
167168
color = when {
168169
selected -> MaterialTheme.colorScheme.secondaryContainer

Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.example.jetcaster.ui.theme
1818

19-
import android.app.Activity
2019
import android.os.Build
2120
import androidx.compose.foundation.isSystemInDarkTheme
2221
import androidx.compose.material3.MaterialTheme
@@ -26,12 +25,8 @@ import androidx.compose.material3.dynamicLightColorScheme
2625
import androidx.compose.material3.lightColorScheme
2726
import androidx.compose.runtime.Composable
2827
import androidx.compose.runtime.Immutable
29-
import androidx.compose.runtime.SideEffect
3028
import androidx.compose.ui.graphics.Color
31-
import androidx.compose.ui.graphics.toArgb
3229
import androidx.compose.ui.platform.LocalContext
33-
import androidx.compose.ui.platform.LocalView
34-
import androidx.core.view.WindowCompat
3530
import com.example.jetcaster.designsystem.theme.JetcasterShapes
3631
import com.example.jetcaster.designsystem.theme.JetcasterTypography
3732
import com.example.jetcaster.designsystem.theme.backgroundDark
@@ -501,14 +496,6 @@ fun JetcasterTheme(
501496
darkTheme -> darkScheme
502497
else -> lightScheme
503498
}
504-
val view = LocalView.current
505-
if (!view.isInEditMode) {
506-
SideEffect {
507-
val window = (view.context as Activity).window
508-
window.statusBarColor = Color.Transparent.toArgb()
509-
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
510-
}
511-
}
512499

513500
MaterialTheme(
514501
colorScheme = colorScheme,

0 commit comments

Comments
 (0)