update dependencies, optimize imports

DatL4g · Dec 2, 2023 · 15eed68 · 15eed68
1 parent 00f1fdb
commit 15eed68
Show file tree

Hide file tree

Showing 82 changed files with 121 additions and 251 deletions.
diff --git a/app/android/src/androidMain/kotlin/dev/datlag/burningseries/App.kt b/app/android/src/androidMain/kotlin/dev/datlag/burningseries/App.kt
@@ -4,8 +4,8 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.multidex.MultiDexApplication
 import dev.datlag.burningseries.model.common.systemProperty
-import dev.datlag.burningseries.shared.module.NetworkModule
 import dev.datlag.burningseries.network.state.NetworkStateSaver
+import dev.datlag.burningseries.shared.module.NetworkModule
 import dev.datlag.burningseries.shared.other.StateSaver
 import dev.datlag.sekret.NativeLoader
 import io.github.aakira.napier.DebugAntilog

diff --git a/app/android/src/androidMain/kotlin/dev/datlag/burningseries/MainActivity.kt b/app/android/src/androidMain/kotlin/dev/datlag/burningseries/MainActivity.kt
@@ -20,26 +20,20 @@ import com.arkivanov.essenty.lifecycle.LifecycleOwner
 import com.arkivanov.essenty.lifecycle.essentyLifecycle
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.shouldShowRationale
-import com.google.android.gms.cast.framework.CastContext
-import dev.datlag.burningseries.shared.common.lifecycle.LocalLifecycleOwner
-import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle
 import dev.datlag.burningseries.shared.App
+import dev.datlag.burningseries.shared.SharedRes
+import dev.datlag.burningseries.shared.common.lifecycle.LocalLifecycleOwner
 import dev.datlag.burningseries.shared.ui.*
 import dev.datlag.burningseries.shared.ui.custom.Permission
 import dev.datlag.burningseries.shared.ui.navigation.NavHostComponent
+import dev.datlag.kast.Kast
 import dev.icerock.moko.resources.compose.stringResource
 import io.kamel.core.config.KamelConfig
 import io.kamel.core.config.takeFrom
 import io.kamel.image.config.Default
 import io.kamel.image.config.LocalKamelConfig
 import io.kamel.image.config.resourcesFetcher
 import io.kamel.image.config.resourcesIdMapper
-import kotlinx.coroutines.flow.MutableStateFlow
-import java.util.concurrent.Executors
-import dev.datlag.burningseries.shared.SharedRes
-import dev.datlag.burningseries.shared.common.withIOContext
-import dev.datlag.kast.Kast
-import kotlinx.coroutines.delay
 
 class MainActivity : AppCompatActivity() {
 

diff --git a/app/android/src/androidMain/kotlin/dev/datlag/burningseries/NotificationDialog.kt b/app/android/src/androidMain/kotlin/dev/datlag/burningseries/NotificationDialog.kt
@@ -5,8 +5,8 @@ import androidx.compose.material.icons.filled.Notifications
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.style.TextOverflow
-import dev.icerock.moko.resources.compose.stringResource
 import dev.datlag.burningseries.shared.SharedRes
+import dev.icerock.moko.resources.compose.stringResource
 
 @Composable
 fun NotificationDialog(text: String, onConfirm: () -> Unit, onDismiss: (Boolean) -> Unit) {

diff --git a/app/desktop/src/jvmMain/kotlin/dev/datlag/burningseries/Main.kt b/app/desktop/src/jvmMain/kotlin/dev/datlag/burningseries/Main.kt
@@ -18,13 +18,14 @@ import com.arkivanov.essenty.lifecycle.Lifecycle
 import com.arkivanov.essenty.lifecycle.LifecycleOwner
 import com.arkivanov.essenty.lifecycle.LifecycleRegistry
 import com.google.firebase.FirebasePlatform
-import dev.datlag.burningseries.shared.common.lifecycle.LocalLifecycleOwner
 import dev.datlag.burningseries.model.common.systemProperty
-import dev.datlag.burningseries.shared.module.NetworkModule
 import dev.datlag.burningseries.network.state.NetworkStateSaver
 import dev.datlag.burningseries.shared.App
 import dev.datlag.burningseries.shared.AppIO
 import dev.datlag.burningseries.shared.LocalWindow
+import dev.datlag.burningseries.shared.SharedRes
+import dev.datlag.burningseries.shared.common.lifecycle.LocalLifecycleOwner
+import dev.datlag.burningseries.shared.module.NetworkModule
 import dev.datlag.burningseries.shared.other.StateSaver
 import dev.datlag.burningseries.shared.ui.navigation.NavHostComponent
 import dev.datlag.burningseries.shared.window.disposableSingleWindowApplication
@@ -41,7 +42,6 @@ import io.kamel.image.config.resourcesFetcher
 import kotlinx.coroutines.runBlocking
 import org.kodein.di.DI
 import java.io.File
-import dev.datlag.burningseries.shared.SharedRes
 
 fun main(vararg args: String) {
     StateSaver.sekretLibraryLoaded = NativeLoader.loadLibrary("sekret", systemProperty("compose.application.resources.dir")?.let { File(it) })

diff --git a/...ndroidMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.android.kt b/...ndroidMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.android.kt
@@ -2,7 +2,6 @@ package dev.datlag.burningseries.shared.common
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap

diff --git a/...d/src/androidMain/kotlin/dev/datlag/burningseries/shared/module/PlatformModule.android.kt b/...d/src/androidMain/kotlin/dev/datlag/burningseries/shared/module/PlatformModule.android.kt
@@ -1,8 +1,8 @@
 package dev.datlag.burningseries.shared.module
 
 import android.content.Context
-import dev.datlag.burningseries.shared.Sekret
 import dev.datlag.burningseries.database.DriverFactory
+import dev.datlag.burningseries.shared.Sekret
 import dev.datlag.burningseries.shared.getPackageName
 import dev.datlag.burningseries.shared.other.StateSaver
 import dev.gitlive.firebase.Firebase

diff --git a/...atlag/burningseries/shared/ui/screen/initial/series/activate/component/WebView.android.kt b/...atlag/burningseries/shared/ui/screen/initial/series/activate/component/WebView.android.kt
@@ -8,10 +8,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import com.google.accompanist.web.rememberWebViewState
+import dev.datlag.burningseries.model.BSUtil
 import dev.datlag.burningseries.shared.SharedRes
 import dev.datlag.burningseries.shared.common.withIOContext
 import dev.datlag.burningseries.shared.common.withMainContext
-import dev.datlag.burningseries.model.BSUtil
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 

diff --git a/.../datlag/burningseries/shared/ui/screen/initial/series/activate/component/WebViewClient.kt b/.../datlag/burningseries/shared/ui/screen/initial/series/activate/component/WebViewClient.kt
@@ -1,7 +1,6 @@
 package dev.datlag.burningseries.shared.ui.screen.initial.series.activate.component
 
 import android.webkit.WebResourceRequest
-import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import com.google.accompanist.web.AccompanistWebViewClient
 

diff --git a/...urningseries/shared/ui/screen/initial/series/activate/dialog/error/ErrorDialog.android.kt b/...urningseries/shared/ui/screen/initial/series/activate/dialog/error/ErrorDialog.android.kt
@@ -7,7 +7,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.style.TextOverflow
 import dev.datlag.burningseries.shared.SharedRes
-import dev.datlag.burningseries.shared.ui.screen.initial.series.activate.dialog.error.ErrorComponent
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable

diff --git a/...ngseries/shared/ui/screen/initial/series/activate/dialog/success/SuccessDialog.android.kt b/...ngseries/shared/ui/screen/initial/series/activate/dialog/success/SuccessDialog.android.kt
@@ -7,7 +7,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.text.style.TextOverflow
 import dev.datlag.burningseries.shared.SharedRes
-import dev.datlag.burningseries.shared.ui.screen.initial.series.activate.dialog.success.SuccessComponent
 import dev.icerock.moko.resources.compose.stringResource
 
 @Composable

diff --git a/...androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.android.kt b/...androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.android.kt
@@ -13,8 +13,6 @@ import android.widget.ImageButton
 import android.widget.TextView
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Cast
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
@@ -39,20 +37,16 @@ import androidx.media3.extractor.ts.DefaultTsPayloadReaderFactory.*
 import androidx.media3.session.MediaSession
 import androidx.media3.ui.DefaultTimeBar
 import androidx.media3.ui.PlayerView
-import androidx.mediarouter.app.MediaRouteButton
 import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import com.google.android.gms.cast.framework.CastButtonFactory
-import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.cast.framework.CastState
+import dev.datlag.burningseries.model.common.scopeCatching
 import dev.datlag.burningseries.shared.R
 import dev.datlag.burningseries.shared.SharedRes
-import dev.datlag.burningseries.shared.common.findActivity
 import dev.datlag.burningseries.shared.common.findWindow
 import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle
 import dev.datlag.burningseries.shared.common.withIOContext
 import dev.datlag.burningseries.shared.common.withMainContext
-import dev.datlag.burningseries.model.common.scopeCatching
 import dev.datlag.burningseries.shared.ui.*
 import dev.datlag.kast.ConnectionState
 import dev.datlag.kast.Kast
@@ -61,7 +55,7 @@ import dev.datlag.nanoid.NanoIdUtils
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
-import java.util.Locale
+import java.util.*
 import kotlin.random.Random
 
 val PseudoRandom = Random(12345) // pseudo random as secure random is not needed

diff --git a/.../kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt b/.../kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt
@@ -19,12 +19,9 @@ import androidx.compose.ui.unit.dp
 import dev.datlag.burningseries.shared.SharedRes
 import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle
 import dev.datlag.burningseries.shared.common.onClick
-import dev.datlag.burningseries.shared.ui.*
 import dev.datlag.kast.*
 import dev.icerock.moko.resources.compose.stringResource
-import io.github.aakira.napier.Napier
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapNotNull
 
 @Composable
 actual fun CastDialog(component: CastComponent) {

diff --git a/...ed/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.android.kt b/...ed/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.android.kt
@@ -2,14 +2,11 @@ package dev.datlag.burningseries.shared.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.toPixelMap
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalLayoutDirection
-import dev.datlag.burningseries.color.createTheme
 import dev.datlag.burningseries.color.utils.ThemeUtils
-import dev.datlag.burningseries.shared.ui.theme.SchemeTheme
 import dev.datlag.burningseries.shared.ui.theme.image.PainterImage
 
 @Composable

diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/common/ExtendCoroutine.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/common/ExtendCoroutine.kt
@@ -3,17 +3,8 @@ package dev.datlag.burningseries.shared.common
 import com.arkivanov.essenty.lifecycle.Lifecycle
 import com.arkivanov.essenty.lifecycle.LifecycleOwner
 import com.arkivanov.essenty.lifecycle.doOnDestroy
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.MainCoroutineDispatcher
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
 import kotlin.coroutines.CoroutineContext
 
 fun <T> MutableStateFlow<T>.safeEmit(value: T, scope: CoroutineScope) {

diff --git a/...c/commonMain/kotlin/dev/datlag/burningseries/shared/common/lifecycle/RepeatOnLifecycle.kt b/...c/commonMain/kotlin/dev/datlag/burningseries/shared/common/lifecycle/RepeatOnLifecycle.kt
@@ -22,15 +22,9 @@ package dev.datlag.burningseries.shared.common.lifecycle
 
 import com.arkivanov.essenty.lifecycle.Lifecycle
 import com.arkivanov.essenty.lifecycle.LifecycleOwner
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
 import kotlin.coroutines.resume
 
 /**

diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/module/DatabaseModule.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/module/DatabaseModule.kt
@@ -1,7 +1,7 @@
 package dev.datlag.burningseries.shared.module
 
-import dev.datlag.burningseries.database.DriverFactory
 import dev.datlag.burningseries.database.BurningSeries
+import dev.datlag.burningseries.database.DriverFactory
 import org.kodein.di.DI
 import org.kodein.di.bindSingleton
 import org.kodein.di.instance

diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/module/NetworkModule.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/module/NetworkModule.kt
@@ -2,11 +2,9 @@ package dev.datlag.burningseries.shared.module
 
 import de.jensklingenberg.ktorfit.Ktorfit
 import de.jensklingenberg.ktorfit.ktorfitBuilder
-import dev.datlag.burningseries.shared.Sekret
 import dev.datlag.burningseries.database.BurningSeries
 import dev.datlag.burningseries.database.common.toGenres
 import dev.datlag.burningseries.database.common.toSearchItems
-import dev.datlag.burningseries.shared.getPackageName
 import dev.datlag.burningseries.network.Firestore
 import dev.datlag.burningseries.network.JsonBase
 import dev.datlag.burningseries.network.WrapAPI
@@ -15,6 +13,8 @@ import dev.datlag.burningseries.network.state.EpisodeStateMachine
 import dev.datlag.burningseries.network.state.HomeStateMachine
 import dev.datlag.burningseries.network.state.SaveStateMachine
 import dev.datlag.burningseries.network.state.SearchStateMachine
+import dev.datlag.burningseries.shared.Sekret
+import dev.datlag.burningseries.shared.getPackageName
 import dev.datlag.burningseries.shared.other.StateSaver
 import io.ktor.client.*
 import io.realm.kotlin.mongodb.App

diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/AutoSizeText.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/AutoSizeText.kt
@@ -2,13 +2,10 @@ package dev.datlag.burningseries.shared.ui.custom
 
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.BoxWithConstraintsScope
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.InternalFoundationTextApi
 import androidx.compose.foundation.text.TextDelegate
 import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -29,12 +26,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.Density
-import androidx.compose.ui.unit.TextUnit
-import androidx.compose.ui.unit.TextUnitType
-import androidx.compose.ui.unit.isUnspecified
-import androidx.compose.ui.unit.min
-import androidx.compose.ui.unit.sp
+import androidx.compose.ui.unit.*
 import kotlin.math.ceil
 import kotlin.math.floor
 import kotlin.reflect.KProperty

diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/CountryImage.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/CountryImage.kt
@@ -1,7 +1,6 @@
 package dev.datlag.burningseries.shared.ui.custom
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
@@ -10,19 +9,13 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import dev.datlag.burningseries.shared.common.ifTrue
 import dev.icerock.moko.resources.compose.painterResource
-import io.github.aakira.napier.Napier
-import kotlin.math.max
 
 @Composable
 fun CountryImage(

diff --git a/...c/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/DefaultCollapsingToolbar.kt b/...c/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/DefaultCollapsingToolbar.kt
@@ -1,10 +1,14 @@
 package dev.datlag.burningseries.shared.ui.custom
 
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.TopAppBar
-import androidx.compose.material3.*
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp

diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/ExpandableText.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/ExpandableText.kt
@@ -4,23 +4,12 @@ import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.Text
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.Layout
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.Placeholder
-import androidx.compose.ui.text.PlaceholderVerticalAlign
-import androidx.compose.ui.text.TextLayoutResult
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight

diff --git a/...ared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/VerticalScrollbar.kt b/...ared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/VerticalScrollbar.kt
@@ -3,7 +3,6 @@ package dev.datlag.burningseries.shared.ui.custom
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.LazyGridState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 
 @Composable

diff --git a/.../commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/toolbar/CollapsingToolbar.kt b/.../commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/toolbar/CollapsingToolbar.kt
@@ -7,21 +7,11 @@ import androidx.compose.foundation.MutatePriority
 import androidx.compose.foundation.gestures.FlingBehavior
 import androidx.compose.foundation.gestures.ScrollScope
 import androidx.compose.foundation.gestures.ScrollableState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clipToBounds
-import androidx.compose.ui.layout.Layout
-import androidx.compose.ui.layout.Measurable
-import androidx.compose.ui.layout.MeasurePolicy
-import androidx.compose.ui.layout.MeasureResult
-import androidx.compose.ui.layout.MeasureScope
-import androidx.compose.ui.layout.ParentDataModifier
+import androidx.compose.ui.layout.*
 import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntSize