diff --git a/app/android/src/androidMain/kotlin/dev/datlag/burningseries/App.kt b/app/android/src/androidMain/kotlin/dev/datlag/burningseries/App.kt index 63e52946..715a7dd1 100644 --- 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 index 762425d0..3e2ce38b 100644 --- a/app/android/src/androidMain/kotlin/dev/datlag/burningseries/MainActivity.kt +++ b/app/android/src/androidMain/kotlin/dev/datlag/burningseries/MainActivity.kt @@ -20,13 +20,13 @@ 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 @@ -34,12 +34,6 @@ 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 index 7490159c..ff1c262e 100644 --- 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 index 96667c08..7a70d315 100644 --- 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/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.android.kt index ffa26593..1df9e846 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.android.kt +++ b/app/shared/src/androidMain/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/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/module/PlatformModule.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/module/PlatformModule.android.kt index 761aed97..76822fa0 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/module/PlatformModule.android.kt +++ b/app/shared/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/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/component/WebView.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/component/WebView.android.kt index b666e423..02da980c 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/component/WebView.android.kt +++ b/app/shared/src/androidMain/kotlin/dev/datlag/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/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/component/WebViewClient.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/component/WebViewClient.kt index 2f04dcdc..eaa3648c 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/component/WebViewClient.kt +++ b/app/shared/src/androidMain/kotlin/dev/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/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/error/ErrorDialog.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/error/ErrorDialog.android.kt index 7fb52099..a5458a78 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/error/ErrorDialog.android.kt +++ b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/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/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/success/SuccessDialog.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/success/SuccessDialog.android.kt index 86751908..d6b895db 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/success/SuccessDialog.android.kt +++ b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/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/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.android.kt index 2ac5ae35..9187e1c7 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.android.kt +++ b/app/shared/src/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/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt index 681ba86f..681f8592 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.android.kt +++ b/app/shared/src/androidMain/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/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.android.kt b/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.android.kt index 9e6bbfd3..f01ffc40 100644 --- a/app/shared/src/androidMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.android.kt +++ b/app/shared/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 index eb4c9619..9d93d849 100644 --- 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 MutableStateFlow.safeEmit(value: T, scope: CoroutineScope) { diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/common/lifecycle/RepeatOnLifecycle.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/common/lifecycle/RepeatOnLifecycle.kt index 9d946816..ad4acd06 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/common/lifecycle/RepeatOnLifecycle.kt +++ b/app/shared/src/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 index ef45940a..5c3b723a 100644 --- 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 index 87e4f5c4..de7fb47c 100644 --- 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 index 3a010c0f..141fa2df 100644 --- 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 index 17d683e0..e43c8ab5 100644 --- 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/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/DefaultCollapsingToolbar.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/DefaultCollapsingToolbar.kt index 501535b6..098a4847 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/DefaultCollapsingToolbar.kt +++ b/app/shared/src/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 index 8ca38b60..bb45dcfe 100644 --- 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/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/VerticalScrollbar.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/VerticalScrollbar.kt index 3b3e2f46..1f384006 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/VerticalScrollbar.kt +++ b/app/shared/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/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/toolbar/CollapsingToolbar.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/toolbar/CollapsingToolbar.kt index 63565280..f2ee86e2 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/toolbar/CollapsingToolbar.kt +++ b/app/shared/src/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 diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/InitialScreenComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/InitialScreenComponent.kt index e863ee12..53bea98f 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/InitialScreenComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/InitialScreenComponent.kt @@ -9,14 +9,14 @@ import com.arkivanov.decompose.ComponentContext import com.arkivanov.decompose.ExperimentalDecomposeApi import com.arkivanov.decompose.router.pages.* import com.arkivanov.decompose.value.Value -import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.model.Series import dev.datlag.burningseries.model.Stream +import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.ui.navigation.Component import dev.datlag.burningseries.shared.ui.screen.initial.favorite.FavoriteScreenComponent import dev.datlag.burningseries.shared.ui.screen.initial.home.HomeScreenComponent import dev.datlag.burningseries.shared.ui.screen.initial.search.SearchScreenComponent -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.MutableStateFlow import org.kodein.di.DI class InitialScreenComponent( diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt index 21b617f4..a58c87b0 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt @@ -22,10 +22,10 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState +import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.common.header import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle import dev.datlag.burningseries.shared.common.onClick -import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.ui.custom.VerticalScrollbar import dev.datlag.burningseries.shared.ui.custom.rememberScrollbarAdapter import dev.datlag.burningseries.shared.ui.screen.initial.home.component.SeriesItem diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreenComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreenComponent.kt index ca830f3d..990c28d9 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreenComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreenComponent.kt @@ -6,14 +6,13 @@ import app.cash.sqldelight.coroutines.mapToList import com.arkivanov.decompose.ComponentContext import com.arkivanov.decompose.router.slot.* import com.arkivanov.decompose.value.Value -import dev.datlag.burningseries.shared.common.ioDispatcher -import dev.datlag.burningseries.shared.common.ioScope import dev.datlag.burningseries.database.BurningSeries import dev.datlag.burningseries.database.Series -import dev.datlag.burningseries.model.Series as ModelSeries import dev.datlag.burningseries.model.Stream import dev.datlag.burningseries.model.algorithm.JaroWinkler import dev.datlag.burningseries.model.common.safeSubList +import dev.datlag.burningseries.shared.common.ioDispatcher +import dev.datlag.burningseries.shared.common.ioScope import dev.datlag.burningseries.shared.ui.navigation.Component import dev.datlag.burningseries.shared.ui.screen.initial.series.SeriesScreenComponent import kotlinx.coroutines.async @@ -22,6 +21,7 @@ import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.* import org.kodein.di.DI import org.kodein.di.instance +import dev.datlag.burningseries.model.Series as ModelSeries class FavoriteScreenComponent( componentContext: ComponentContext, diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeComponent.kt index 25cf0b1d..6d91a21e 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeComponent.kt @@ -4,7 +4,6 @@ import com.arkivanov.decompose.router.slot.ChildSlot import com.arkivanov.decompose.value.Value import dev.datlag.burningseries.model.state.HomeState import dev.datlag.burningseries.shared.ui.navigation.Component -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow interface HomeComponent : Component { diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreen.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreen.kt index b2dca17c..ef179e3d 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreen.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreen.kt @@ -17,12 +17,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState -import dev.datlag.burningseries.shared.common.header -import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle import dev.datlag.burningseries.model.Home import dev.datlag.burningseries.model.state.HomeState -import dev.datlag.burningseries.shared.other.StateSaver import dev.datlag.burningseries.shared.SharedRes +import dev.datlag.burningseries.shared.common.header +import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle +import dev.datlag.burningseries.shared.other.StateSaver import dev.datlag.burningseries.shared.ui.custom.VerticalScrollbar import dev.datlag.burningseries.shared.ui.custom.rememberScrollbarAdapter import dev.datlag.burningseries.shared.ui.custom.state.ErrorState diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreenComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreenComponent.kt index e7bfdaa6..f960ffbc 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreenComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreenComponent.kt @@ -4,17 +4,20 @@ import androidx.compose.runtime.Composable import com.arkivanov.decompose.ComponentContext import com.arkivanov.decompose.router.slot.* import com.arkivanov.decompose.value.Value -import dev.datlag.burningseries.shared.common.ioDispatcher -import dev.datlag.burningseries.shared.common.ioScope -import dev.datlag.burningseries.shared.common.launchIO import dev.datlag.burningseries.model.Series import dev.datlag.burningseries.model.Stream import dev.datlag.burningseries.model.state.HomeAction import dev.datlag.burningseries.model.state.HomeState import dev.datlag.burningseries.network.state.HomeStateMachine +import dev.datlag.burningseries.shared.common.ioDispatcher +import dev.datlag.burningseries.shared.common.ioScope +import dev.datlag.burningseries.shared.common.launchIO import dev.datlag.burningseries.shared.ui.navigation.Component import dev.datlag.burningseries.shared.ui.screen.initial.series.SeriesScreenComponent -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.stateIn import org.kodein.di.DI import org.kodein.di.instance diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt index 17bef5f8..23c4c265 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/EpisodeItem.kt @@ -6,7 +6,8 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.grid.LazyGridItemScope import androidx.compose.material3.* -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip @@ -14,10 +15,10 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import dev.datlag.burningseries.shared.common.bounceClick -import dev.datlag.burningseries.shared.common.onClick import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.model.Home +import dev.datlag.burningseries.shared.common.bounceClick +import dev.datlag.burningseries.shared.common.onClick import dev.datlag.burningseries.shared.ui.custom.AutoSizeText import dev.datlag.burningseries.shared.ui.custom.CountryImage import io.kamel.core.Resource diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt index 2c6efe81..725c5f37 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/SeriesItem.kt @@ -13,13 +13,13 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import dev.datlag.burningseries.shared.common.bounceClick -import dev.datlag.burningseries.shared.common.onClick -import dev.datlag.burningseries.database.Series as DBSeries import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.model.Home +import dev.datlag.burningseries.shared.common.bounceClick +import dev.datlag.burningseries.shared.common.onClick import io.kamel.core.Resource import io.kamel.image.asyncPainterResource +import dev.datlag.burningseries.database.Series as DBSeries @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt index d11d105b..ab9bd59c 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreen.kt @@ -1,6 +1,9 @@ package dev.datlag.burningseries.shared.ui.screen.initial.search -import androidx.compose.animation.* +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.animateContentSize +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn @@ -22,11 +25,11 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState +import dev.datlag.burningseries.model.state.SearchState +import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.common.OnBottomReached import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle import dev.datlag.burningseries.shared.common.onClick -import dev.datlag.burningseries.model.state.SearchState -import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.ui.custom.VerticalScrollbar import dev.datlag.burningseries.shared.ui.custom.rememberScrollbarAdapter import dev.datlag.burningseries.shared.ui.custom.state.ErrorState diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreenComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreenComponent.kt index 8542d396..54f61a14 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreenComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/search/SearchScreenComponent.kt @@ -4,9 +4,6 @@ import androidx.compose.runtime.Composable import com.arkivanov.decompose.ComponentContext import com.arkivanov.decompose.router.slot.* import com.arkivanov.decompose.value.Value -import dev.datlag.burningseries.shared.common.ioDispatcher -import dev.datlag.burningseries.shared.common.ioScope -import dev.datlag.burningseries.shared.common.launchIO import dev.datlag.burningseries.model.Genre import dev.datlag.burningseries.model.Series import dev.datlag.burningseries.model.Stream @@ -15,12 +12,14 @@ import dev.datlag.burningseries.model.common.safeSubList import dev.datlag.burningseries.model.state.SearchAction import dev.datlag.burningseries.model.state.SearchState import dev.datlag.burningseries.network.state.SearchStateMachine +import dev.datlag.burningseries.shared.common.ioDispatcher +import dev.datlag.burningseries.shared.common.ioScope +import dev.datlag.burningseries.shared.common.launchIO import dev.datlag.burningseries.shared.ui.navigation.Component import dev.datlag.burningseries.shared.ui.screen.initial.series.SeriesScreenComponent import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.currentCoroutineContext import kotlinx.coroutines.flow.* import org.kodein.di.DI import org.kodein.di.instance diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesComponent.kt index 4820d52c..c7c40ab1 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesComponent.kt @@ -4,11 +4,9 @@ import com.arkivanov.decompose.router.slot.ChildSlot import com.arkivanov.decompose.value.Value import dev.datlag.burningseries.database.Episode import dev.datlag.burningseries.model.Series -import dev.datlag.burningseries.model.state.EpisodeState import dev.datlag.burningseries.model.state.SeriesState import dev.datlag.burningseries.shared.ui.navigation.Component import dev.datlag.burningseries.shared.ui.navigation.DialogComponent -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow interface SeriesComponent : Component { diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreen.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreen.kt index afe42f72..5dd29e3a 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreen.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreen.kt @@ -25,14 +25,14 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState -import dev.datlag.burningseries.shared.common.diagonalShape -import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle +import dev.datlag.burningseries.database.Episode import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.model.Series import dev.datlag.burningseries.model.state.SeriesState -import dev.datlag.burningseries.shared.other.StateSaver import dev.datlag.burningseries.shared.SharedRes -import dev.datlag.burningseries.database.Episode +import dev.datlag.burningseries.shared.common.diagonalShape +import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle +import dev.datlag.burningseries.shared.other.StateSaver import dev.datlag.burningseries.shared.ui.custom.DefaultCollapsingToolbar import dev.datlag.burningseries.shared.ui.custom.VerticalScrollbar import dev.datlag.burningseries.shared.ui.custom.rememberScrollbarAdapter diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreenComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreenComponent.kt index fb8e317d..75eec702 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreenComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreenComponent.kt @@ -8,10 +8,7 @@ import com.arkivanov.decompose.ComponentContext import com.arkivanov.decompose.router.slot.* import com.arkivanov.decompose.value.Value import com.arkivanov.essenty.backhandler.BackCallback -import dev.datlag.burningseries.shared.Sekret -import dev.datlag.burningseries.shared.common.* import dev.datlag.burningseries.database.BurningSeries -import dev.datlag.burningseries.shared.getPackageName import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.model.Series import dev.datlag.burningseries.model.Stream @@ -22,10 +19,12 @@ import dev.datlag.burningseries.model.state.SeriesState import dev.datlag.burningseries.network.WrapAPI import dev.datlag.burningseries.network.state.EpisodeStateMachine import dev.datlag.burningseries.network.state.SeriesStateMachine +import dev.datlag.burningseries.shared.Sekret import dev.datlag.burningseries.shared.common.ioDispatcher import dev.datlag.burningseries.shared.common.ioScope import dev.datlag.burningseries.shared.common.launchIO import dev.datlag.burningseries.shared.common.withMainContext +import dev.datlag.burningseries.shared.getPackageName import dev.datlag.burningseries.shared.other.StateSaver import dev.datlag.burningseries.shared.ui.navigation.Component import dev.datlag.burningseries.shared.ui.navigation.DialogComponent diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateComponent.kt index 685b8e4f..7909b21d 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateComponent.kt @@ -3,7 +3,6 @@ package dev.datlag.burningseries.shared.ui.screen.initial.series.activate import com.arkivanov.decompose.router.slot.ChildSlot import com.arkivanov.decompose.value.Value import dev.datlag.burningseries.model.Series -import dev.datlag.burningseries.model.Stream import dev.datlag.burningseries.shared.ui.navigation.Component import dev.datlag.burningseries.shared.ui.navigation.DialogComponent import dev.datlag.burningseries.shared.ui.screen.initial.series.activate.component.DialogConfig diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateScreen.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateScreen.kt index 3945507e..030db492 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateScreen.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateScreen.kt @@ -12,12 +12,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.arkivanov.decompose.extensions.compose.jetbrains.subscribeAsState -import dev.icerock.moko.resources.compose.stringResource +import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle -import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.shared.ui.custom.state.UnreachableState import dev.datlag.burningseries.shared.ui.screen.initial.series.activate.component.WebView +import dev.icerock.moko.resources.compose.stringResource @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateScreenComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateScreenComponent.kt index bc566600..4b1225d9 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateScreenComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/ActivateScreenComponent.kt @@ -7,17 +7,16 @@ import com.arkivanov.decompose.router.slot.activate import com.arkivanov.decompose.router.slot.childSlot import com.arkivanov.decompose.router.slot.dismiss import com.arkivanov.essenty.backhandler.BackCallback -import dev.datlag.burningseries.model.Series -import org.kodein.di.DI -import dev.datlag.burningseries.shared.common.ioScope -import dev.datlag.burningseries.shared.common.launchIO -import dev.datlag.burningseries.shared.common.withMainContext import dev.datlag.burningseries.model.HosterScraping +import dev.datlag.burningseries.model.Series import dev.datlag.burningseries.model.Stream import dev.datlag.burningseries.model.common.scopeCatching import dev.datlag.burningseries.model.state.SaveAction import dev.datlag.burningseries.model.state.SaveState import dev.datlag.burningseries.network.state.SaveStateMachine +import dev.datlag.burningseries.shared.common.ioScope +import dev.datlag.burningseries.shared.common.launchIO +import dev.datlag.burningseries.shared.common.withMainContext import dev.datlag.burningseries.shared.ui.navigation.DialogComponent import dev.datlag.burningseries.shared.ui.screen.initial.series.activate.component.DialogConfig import dev.datlag.burningseries.shared.ui.screen.initial.series.activate.dialog.error.ErrorDialogComponent @@ -26,6 +25,7 @@ import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.serialization.json.Json +import org.kodein.di.DI import org.kodein.di.instance class ActivateScreenComponent( diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/error/ErrorDialog.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/error/ErrorDialog.kt index 7cdfa35e..0d214bb9 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/error/ErrorDialog.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/error/ErrorDialog.kt @@ -1,13 +1,6 @@ package dev.datlag.burningseries.shared.ui.screen.initial.series.activate.dialog.error -import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text 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 @Composable expect fun ErrorDialog(component: ErrorComponent) \ No newline at end of file diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/success/SuccessDialog.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/success/SuccessDialog.kt index 9c8b853a..e59381f8 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/success/SuccessDialog.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/activate/dialog/success/SuccessDialog.kt @@ -1,13 +1,6 @@ package dev.datlag.burningseries.shared.ui.screen.initial.series.activate.dialog.success -import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Button -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text 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 @Composable expect fun SuccessDialog(component: SuccessComponent) \ No newline at end of file diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/DescriptionText.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/DescriptionText.kt index 9553bf81..22209915 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/DescriptionText.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/DescriptionText.kt @@ -8,9 +8,6 @@ import androidx.compose.material.icons.filled.ExpandMore import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi -import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass -import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass import androidx.compose.runtime.* import androidx.compose.ui.Modifier import dev.datlag.burningseries.shared.SharedRes diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt index c76f5773..f4523205 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/EpisodeItem.kt @@ -10,7 +10,10 @@ import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha @@ -20,14 +23,13 @@ import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.vanniktech.blurhash.BlurHash -import dev.datlag.burningseries.shared.common.* import dev.datlag.burningseries.database.Episode import dev.datlag.burningseries.model.Series +import dev.datlag.burningseries.shared.SharedRes +import dev.datlag.burningseries.shared.common.* import dev.datlag.burningseries.shared.ui.theme.TopLeftBottomRightRoundedShape import dev.icerock.moko.resources.compose.stringResource import kotlin.math.roundToInt -import dev.datlag.burningseries.shared.SharedRes -import dev.datlag.burningseries.shared.common.* @Composable fun EpisodeItem(content: Series.Episode, dbEpisode: Episode?, isLoading: Boolean, onClick: () -> Unit) { diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/SeasonAndLanguageButtons.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/SeasonAndLanguageButtons.kt index ed64ecc3..4f750791 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/SeasonAndLanguageButtons.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/component/SeasonAndLanguageButtons.kt @@ -3,7 +3,6 @@ package dev.datlag.burningseries.shared.ui.screen.initial.series.component import androidx.compose.foundation.layout.* import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults -import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -12,7 +11,6 @@ import androidx.compose.ui.unit.dp import dev.datlag.burningseries.model.Series import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.ui.custom.CountryImage -import dev.datlag.burningseries.shared.ui.theme.MaterialSymbols import dev.icerock.moko.resources.compose.stringResource @OptIn(ExperimentalLayoutApi::class) diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/dialog/unavailable/UnavailableDialog.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/dialog/unavailable/UnavailableDialog.kt index 17df1d8d..0bf89c03 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/dialog/unavailable/UnavailableDialog.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/dialog/unavailable/UnavailableDialog.kt @@ -1,6 +1,9 @@ package dev.datlag.burningseries.shared.ui.screen.initial.series.dialog.unavailable -import androidx.compose.material3.* +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.text.style.TextOverflow import dev.datlag.burningseries.shared.SharedRes diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreenComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreenComponent.kt index 57fe8ec2..2af5e86e 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreenComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreenComponent.kt @@ -7,14 +7,14 @@ import com.arkivanov.decompose.ComponentContext import com.arkivanov.decompose.router.slot.* import com.arkivanov.decompose.value.Value import com.arkivanov.essenty.backhandler.BackCallback -import dev.datlag.burningseries.shared.common.ioScope -import dev.datlag.burningseries.shared.common.launchIO import dev.datlag.burningseries.database.BurningSeries import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.model.Series import dev.datlag.burningseries.model.Stream import dev.datlag.burningseries.model.state.EpisodeState import dev.datlag.burningseries.network.state.EpisodeStateMachine +import dev.datlag.burningseries.shared.common.ioScope +import dev.datlag.burningseries.shared.common.launchIO import dev.datlag.burningseries.shared.ui.navigation.DialogComponent import dev.datlag.burningseries.shared.ui.screen.video.dialog.cast.CastDialogComponent import dev.datlag.burningseries.shared.ui.screen.video.dialog.subtitle.SubtitleDialogComponent diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastComponent.kt index 7c07f713..3629810e 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastComponent.kt @@ -1,7 +1,6 @@ package dev.datlag.burningseries.shared.ui.screen.video.dialog.cast import dev.datlag.burningseries.shared.ui.navigation.DialogComponent -import dev.datlag.kast.Device interface CastComponent : DialogComponent { } \ No newline at end of file diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.kt index 1c1df722..b27d0b1b 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialog.kt @@ -1,7 +1,6 @@ package dev.datlag.burningseries.shared.ui.screen.video.dialog.cast import androidx.compose.runtime.Composable -import dev.datlag.kast.Kast @Composable expect fun CastDialog(component: CastComponent) \ No newline at end of file diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialogComponent.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialogComponent.kt index 606398c4..2558acba 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialogComponent.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/cast/CastDialogComponent.kt @@ -2,7 +2,6 @@ package dev.datlag.burningseries.shared.ui.screen.video.dialog.cast import androidx.compose.runtime.Composable import com.arkivanov.decompose.ComponentContext -import dev.datlag.kast.Device import org.kodein.di.DI class CastDialogComponent( diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/subtitle/SubtitleDialog.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/subtitle/SubtitleDialog.kt index aab1175b..50489db4 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/subtitle/SubtitleDialog.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/dialog/subtitle/SubtitleDialog.kt @@ -15,9 +15,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.Role import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import dev.icerock.moko.resources.compose.stringResource import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.ui.custom.CountryImage +import dev.icerock.moko.resources.compose.stringResource @Composable fun SubtitleDialog(component: SubtitleComponent) { diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/CountryImage.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/CountryImage.kt index 39b4f215..102a1c37 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/CountryImage.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/CountryImage.kt @@ -1,10 +1,9 @@ package dev.datlag.burningseries.shared.ui.theme -import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.model.common.scopeCatching +import dev.datlag.burningseries.shared.SharedRes import dev.icerock.moko.resources.ImageResource -import dev.icerock.moko.resources.getImageByFileName -import java.util.Locale +import java.util.* object CountryImage { diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/MaterialSymbols.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/MaterialSymbols.kt index fe08ef3e..5071ea99 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/MaterialSymbols.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/MaterialSymbols.kt @@ -1,12 +1,5 @@ package dev.datlag.burningseries.shared.ui.theme -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.ui.graphics.* -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp - data object MaterialSymbols { } \ No newline at end of file diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.kt index 2636da1b..7d1ffb09 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.kt @@ -10,8 +10,8 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.painter.Painter -import dev.datlag.burningseries.shared.LocalDarkMode import dev.datlag.burningseries.color.theme.Theme +import dev.datlag.burningseries.shared.LocalDarkMode import dev.datlag.burningseries.shared.common.launchIO import dev.datlag.burningseries.shared.common.lifecycle.collectAsStateWithLifecycle import dev.datlag.burningseries.shared.common.withIOContext diff --git a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/Theme.kt b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/Theme.kt index cdd4b03b..7bac3c20 100644 --- a/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/Theme.kt +++ b/app/shared/src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/theme/Theme.kt @@ -4,9 +4,9 @@ import androidx.compose.material.Colors import androidx.compose.material.Shapes import androidx.compose.material.darkColors import androidx.compose.material.lightColors +import androidx.compose.material3.Typography import androidx.compose.runtime.Composable import androidx.compose.runtime.remember -import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontStyle @@ -14,7 +14,6 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp import dev.datlag.burningseries.shared.SharedRes import dev.icerock.moko.resources.compose.asFont -import dev.icerock.moko.resources.compose.fontFamilyResource fun androidx.compose.material3.ColorScheme.toLegacyColors(isDark: Boolean): Colors { return if (isDark) { diff --git a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/AppIO.kt b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/AppIO.kt index 69aaaae0..4f92a02b 100644 --- a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/AppIO.kt +++ b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/AppIO.kt @@ -2,9 +2,9 @@ package dev.datlag.burningseries.shared import androidx.compose.ui.awt.ComposeWindow import androidx.compose.ui.res.useResource +import dev.datlag.burningseries.model.common.* import dev.datlag.burningseries.shared.common.launchIO import dev.datlag.burningseries.shared.common.withMainContext -import dev.datlag.burningseries.model.common.* import dev.icerock.moko.resources.AssetResource import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.async diff --git a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.desktop.kt b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.desktop.kt index adce457e..cacb0e9b 100644 --- a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.desktop.kt +++ b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/common/PlatformExtendCompose.desktop.kt @@ -1,9 +1,9 @@ package dev.datlag.burningseries.shared.common import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.ui.Modifier import androidx.compose.foundation.onClick import androidx.compose.runtime.compositionLocalOf +import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.ImageBitmap import androidx.compose.ui.graphics.toComposeImageBitmap import com.arkivanov.decompose.ExperimentalDecomposeApi diff --git a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/module/PlatformModule.desktop.kt b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/module/PlatformModule.desktop.kt index c8919a65..a7780364 100644 --- a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/module/PlatformModule.desktop.kt +++ b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/module/PlatformModule.desktop.kt @@ -1,9 +1,9 @@ package dev.datlag.burningseries.shared.module import android.content.Context +import dev.datlag.burningseries.database.DriverFactory import dev.datlag.burningseries.shared.AppIO import dev.datlag.burningseries.shared.Sekret -import dev.datlag.burningseries.database.DriverFactory import dev.datlag.burningseries.shared.getPackageName import dev.datlag.burningseries.shared.other.StateSaver import dev.gitlive.firebase.Firebase diff --git a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/DeviceContent.desktop.kt b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/DeviceContent.desktop.kt index 8fd772bf..7f699354 100644 --- a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/DeviceContent.desktop.kt +++ b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/component/DeviceContent.desktop.kt @@ -11,11 +11,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp +import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.common.LocalRestartRequired import dev.datlag.burningseries.shared.common.header import dev.datlag.burningseries.shared.other.CEFState import dev.datlag.burningseries.shared.other.LocalCEFInitialization -import dev.datlag.burningseries.shared.SharedRes import dev.datlag.burningseries.shared.window.ApplicationDisposer import dev.icerock.moko.resources.compose.stringResource diff --git a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoControls.kt b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoControls.kt index cde96a08..a7d87e39 100644 --- a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoControls.kt +++ b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoControls.kt @@ -1,7 +1,10 @@ package dev.datlag.burningseries.shared.ui.screen.video import androidx.compose.foundation.background -import androidx.compose.foundation.layout.* +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.* import androidx.compose.material3.* diff --git a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.desktop.kt b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.desktop.kt index 9bc4bd81..0c89b0d4 100644 --- a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.desktop.kt +++ b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/screen/video/VideoScreen.desktop.kt @@ -7,7 +7,8 @@ import androidx.compose.material.icons.filled.ArrowBackIosNew import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.Text -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color diff --git a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.desktop.kt b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.desktop.kt index 68f18de6..758a3627 100644 --- a/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.desktop.kt +++ b/app/shared/src/desktopMain/kotlin/dev/datlag/burningseries/shared/ui/theme/SchemeTheme.desktop.kt @@ -10,8 +10,8 @@ import androidx.compose.ui.graphics.toAwtImage import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalLayoutDirection import com.dzirbel.contextmenu.MaterialContextMenuRepresentation -import dev.datlag.burningseries.shared.ContextMenuColors import dev.datlag.burningseries.color.createTheme +import dev.datlag.burningseries.shared.ContextMenuColors @OptIn(ExperimentalComposeUiApi::class) @Composable diff --git a/database/src/commonMain/kotlin/dev/datlag/burningseries/database/common/ExtendModels.kt b/database/src/commonMain/kotlin/dev/datlag/burningseries/database/common/ExtendModels.kt index 827d0d3e..beea10b0 100644 --- a/database/src/commonMain/kotlin/dev/datlag/burningseries/database/common/ExtendModels.kt +++ b/database/src/commonMain/kotlin/dev/datlag/burningseries/database/common/ExtendModels.kt @@ -1,14 +1,14 @@ package dev.datlag.burningseries.database.common -import dev.datlag.burningseries.database.Hoster -import dev.datlag.burningseries.model.Series.Episode.Hoster as ModelHoster import dev.datlag.burningseries.database.Episode +import dev.datlag.burningseries.database.Hoster import dev.datlag.burningseries.database.SearchItem -import dev.datlag.burningseries.model.Series.Episode as ModelEpisode import dev.datlag.burningseries.database.Series import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.model.Genre import dev.datlag.burningseries.model.Series as ModelSeries +import dev.datlag.burningseries.model.Series.Episode as ModelEpisode +import dev.datlag.burningseries.model.Series.Episode.Hoster as ModelHoster fun Series.toModelSeries(episodes: List, hosters: List): ModelSeries { return ModelSeries( diff --git a/extension/background/src/jsMain/kotlin/background.kt b/extension/background/src/jsMain/kotlin/background.kt index f92614c5..2d7ef5d8 100644 --- a/extension/background/src/jsMain/kotlin/background.kt +++ b/extension/background/src/jsMain/kotlin/background.kt @@ -20,7 +20,10 @@ import io.ktor.client.plugins.contentnegotiation.* import io.ktor.serialization.kotlinx.json.* import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.flowOn +import kotlinx.coroutines.flow.shareIn import kotlinx.coroutines.promise import kotlinx.serialization.json.Json diff --git a/extension/base/src/jsMain/kotlin/browser/events/Event.kt b/extension/base/src/jsMain/kotlin/browser/events/Event.kt index e4c2a8b1..7f00c46d 100644 --- a/extension/base/src/jsMain/kotlin/browser/events/Event.kt +++ b/extension/base/src/jsMain/kotlin/browser/events/Event.kt @@ -3,13 +3,6 @@ package browser.events -import kotlin.Any -import kotlin.Array -import kotlin.Boolean -import kotlin.Int -import kotlin.String -import kotlin.Unit - /** * An object which allows the addition and removal of listeners for a Chrome event. */ diff --git a/extension/base/src/jsMain/kotlin/browser/events/Rule.kt b/extension/base/src/jsMain/kotlin/browser/events/Rule.kt index 2d9665ea..5262894f 100644 --- a/extension/base/src/jsMain/kotlin/browser/events/Rule.kt +++ b/extension/base/src/jsMain/kotlin/browser/events/Rule.kt @@ -3,10 +3,6 @@ package browser.events -import kotlin.Array -import kotlin.Int -import kotlin.String - /** * Description of a declarative rule for handling events. */ diff --git a/extension/base/src/jsMain/kotlin/browser/tabs/MutedInfoReason.kt b/extension/base/src/jsMain/kotlin/browser/tabs/MutedInfoReason.kt index b1f2b8dc..5279571d 100644 --- a/extension/base/src/jsMain/kotlin/browser/tabs/MutedInfoReason.kt +++ b/extension/base/src/jsMain/kotlin/browser/tabs/MutedInfoReason.kt @@ -1,7 +1,5 @@ package browser.tabs -import kotlin.String - /** * An event that caused a muted state change. */ diff --git a/extension/base/src/jsMain/kotlin/browser/tabs/TabStatus.kt b/extension/base/src/jsMain/kotlin/browser/tabs/TabStatus.kt index 78c5852f..21402c9c 100644 --- a/extension/base/src/jsMain/kotlin/browser/tabs/TabStatus.kt +++ b/extension/base/src/jsMain/kotlin/browser/tabs/TabStatus.kt @@ -1,7 +1,5 @@ package browser.tabs -import kotlin.String - /** * The tab's loading status. */ diff --git a/extension/content/src/jsMain/kotlin/content.kt b/extension/content/src/jsMain/kotlin/content.kt index 28e5eefd..453be159 100644 --- a/extension/content/src/jsMain/kotlin/content.kt +++ b/extension/content/src/jsMain/kotlin/content.kt @@ -10,10 +10,7 @@ import kotlinx.browser.document import kotlinx.browser.window import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import kotlinx.dom.hasClass import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c563c635..68828798 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,11 +26,11 @@ instesx = "0.1.0-alpha10" jsunpacker = "1.0.2" kamel = "0.9.0" kcef = "2023.10.13" -kodein = "7.21.0" +kodein = "7.21.1" kotlin = "1.9.21" ksp = "1.9.21-1.0.15" ktor = "2.3.6" -ktorfit = "1.10.1" +ktorfit = "1.10.2" ktsoup = "0.3.0" lang = "3.14.0" material = "1.10.0" @@ -43,11 +43,11 @@ osdetector = "1.7.3" parcelable = "1.2.0" protobuf = "0.9.4" protoc = "3.24.4" -realm = "1.12.0" +realm = "1.13.0" sekret = "0.2.1" -serialization-json = "1.6.0" +serialization-json = "1.6.2" splashscreen = "1.0.1" -sqldelight = "2.0.0" +sqldelight = "2.0.1" turbine = "1.0.0" versions = "0.50.0" vlcj = "4.8.2" diff --git a/model/src/commonMain/kotlin/dev/datlag/burningseries/model/FirestoreQuery.kt b/model/src/commonMain/kotlin/dev/datlag/burningseries/model/FirestoreQuery.kt index 4240e938..c12846f4 100644 --- a/model/src/commonMain/kotlin/dev/datlag/burningseries/model/FirestoreQuery.kt +++ b/model/src/commonMain/kotlin/dev/datlag/burningseries/model/FirestoreQuery.kt @@ -83,4 +83,9 @@ data class FirestoreQuery( @SerialName("fieldPath") val fieldPath: String ) } + + @Serializable + data class Response( + @SerialName("document") val document: FirestoreDocument + ) } diff --git a/model/src/commonMain/kotlin/dev/datlag/burningseries/model/FirestoreQueryResponse.kt b/model/src/commonMain/kotlin/dev/datlag/burningseries/model/FirestoreQueryResponse.kt deleted file mode 100644 index a3b1b140..00000000 --- a/model/src/commonMain/kotlin/dev/datlag/burningseries/model/FirestoreQueryResponse.kt +++ /dev/null @@ -1,9 +0,0 @@ -package dev.datlag.burningseries.model - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class FirestoreQueryResponse( - @SerialName("document") val document: FirestoreDocument -) \ No newline at end of file diff --git a/model/src/commonMain/kotlin/dev/datlag/burningseries/model/common/ExtendCoroutine.kt b/model/src/commonMain/kotlin/dev/datlag/burningseries/model/common/ExtendCoroutine.kt index 8288705a..14cb51d5 100644 --- a/model/src/commonMain/kotlin/dev/datlag/burningseries/model/common/ExtendCoroutine.kt +++ b/model/src/commonMain/kotlin/dev/datlag/burningseries/model/common/ExtendCoroutine.kt @@ -3,7 +3,6 @@ package dev.datlag.burningseries.model.common import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.coroutineScope -import kotlinx.coroutines.flow.Flow fun scopeCatching(block: () -> T): Result = try { Result.success(block()) diff --git a/model/src/commonMain/kotlin/dev/datlag/burningseries/model/state/EpisodeState.kt b/model/src/commonMain/kotlin/dev/datlag/burningseries/model/state/EpisodeState.kt index 34a74d24..0bbde542 100644 --- a/model/src/commonMain/kotlin/dev/datlag/burningseries/model/state/EpisodeState.kt +++ b/model/src/commonMain/kotlin/dev/datlag/burningseries/model/state/EpisodeState.kt @@ -1,6 +1,5 @@ package dev.datlag.burningseries.model.state -import dev.datlag.burningseries.model.HosterScraping import dev.datlag.burningseries.model.Series import dev.datlag.burningseries.model.Stream diff --git a/network/src/androidMain/kotlin/dev/datlag/burningseries/network/firebase/FireStore.android.kt b/network/src/androidMain/kotlin/dev/datlag/burningseries/network/firebase/FireStore.android.kt index e844cca5..384be6ae 100644 --- a/network/src/androidMain/kotlin/dev/datlag/burningseries/network/firebase/FireStore.android.kt +++ b/network/src/androidMain/kotlin/dev/datlag/burningseries/network/firebase/FireStore.android.kt @@ -4,7 +4,6 @@ import dev.datlag.burningseries.model.HosterScraping import dev.datlag.burningseries.model.common.suspendCatching import dev.datlag.burningseries.network.Firestore import dev.gitlive.firebase.auth.FirebaseUser -import dev.gitlive.firebase.firestore.DocumentReference import dev.gitlive.firebase.firestore.FirebaseFirestore import dev.gitlive.firebase.firestore.where diff --git a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/Firestore.kt b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/Firestore.kt index 588240fd..742ff720 100644 --- a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/Firestore.kt +++ b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/Firestore.kt @@ -3,9 +3,7 @@ package dev.datlag.burningseries.network import de.jensklingenberg.ktorfit.http.* import dev.datlag.burningseries.model.FirestoreDocument import dev.datlag.burningseries.model.FirestoreQuery -import dev.datlag.burningseries.model.FirestoreQueryResponse import io.ktor.client.statement.* -import kotlinx.serialization.json.JsonElement interface Firestore { @@ -14,7 +12,7 @@ interface Firestore { "Accept: application/json" ) @POST("databases/(default)/documents:runQuery") - suspend fun query(@Body request: FirestoreQuery): List + suspend fun query(@Body request: FirestoreQuery): List @Headers( "Content-Type: application/json", diff --git a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/WrapAPI.kt b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/WrapAPI.kt index d9fd6252..1374c1d5 100644 --- a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/WrapAPI.kt +++ b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/WrapAPI.kt @@ -3,7 +3,6 @@ package dev.datlag.burningseries.network import de.jensklingenberg.ktorfit.http.GET import de.jensklingenberg.ktorfit.http.Query import dev.datlag.burningseries.model.WrapAPIResponse -import kotlinx.serialization.json.JsonElement interface WrapAPI { diff --git a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/BurningSeries.kt b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/BurningSeries.kt index 30b13bb4..4e2a9688 100644 --- a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/BurningSeries.kt +++ b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/BurningSeries.kt @@ -4,16 +4,12 @@ import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.model.Genre import dev.datlag.burningseries.model.Home import dev.datlag.burningseries.model.Series -import dev.datlag.burningseries.model.common.getDigitsOrNull import dev.datlag.burningseries.model.common.suspendCatching import dev.datlag.burningseries.network.common.getHref import dev.datlag.burningseries.network.common.getSrc import dev.datlag.burningseries.network.common.getTitle import dev.datlag.burningseries.network.common.getValue import io.ktor.client.* -import io.ktor.client.request.* -import io.ktor.client.statement.* -import io.ktor.http.* import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.coroutineScope diff --git a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/hoster/Streamtape.kt b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/hoster/Streamtape.kt index 6a33a957..61e437c7 100644 --- a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/hoster/Streamtape.kt +++ b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/scraper/hoster/Streamtape.kt @@ -2,7 +2,6 @@ package dev.datlag.burningseries.network.scraper.hoster import dev.datlag.burningseries.model.common.listFrom import dev.datlag.burningseries.network.scraper.Video -import io.github.aakira.napier.Napier import ktsoup.KtSoupDocument class Streamtape : Manipulation { diff --git a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/state/HomeStateMachine.kt b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/state/HomeStateMachine.kt index c1e8e5d1..3106d6db 100644 --- a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/state/HomeStateMachine.kt +++ b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/state/HomeStateMachine.kt @@ -2,13 +2,12 @@ package dev.datlag.burningseries.network.state import com.freeletics.flowredux.dsl.FlowReduxStateMachine import dev.datlag.burningseries.model.Home -import dev.datlag.burningseries.model.state.HomeState import dev.datlag.burningseries.model.state.HomeAction +import dev.datlag.burningseries.model.state.HomeState import dev.datlag.burningseries.network.WrapAPI import dev.datlag.burningseries.network.scraper.BurningSeries import io.ktor.client.* import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.delay import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromJsonElement diff --git a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/state/SeriesStateMachine.kt b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/state/SeriesStateMachine.kt index 4ace20cb..96eb43b5 100644 --- a/network/src/commonMain/kotlin/dev/datlag/burningseries/network/state/SeriesStateMachine.kt +++ b/network/src/commonMain/kotlin/dev/datlag/burningseries/network/state/SeriesStateMachine.kt @@ -3,7 +3,6 @@ package dev.datlag.burningseries.network.state import com.freeletics.flowredux.dsl.FlowReduxStateMachine import dev.datlag.burningseries.model.BSUtil import dev.datlag.burningseries.model.Series -import dev.datlag.burningseries.model.WrapAPIResponse import dev.datlag.burningseries.model.state.SeriesAction import dev.datlag.burningseries.model.state.SeriesState import dev.datlag.burningseries.network.WrapAPI @@ -11,7 +10,6 @@ import dev.datlag.burningseries.network.scraper.BurningSeries import io.ktor.client.* import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.serialization.json.Json -import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.decodeFromJsonElement @OptIn(ExperimentalCoroutinesApi::class) diff --git a/network/src/jvmMain/kotlin/dev/datlag/burningseries/network/firebase/FireStore.jvm.kt b/network/src/jvmMain/kotlin/dev/datlag/burningseries/network/firebase/FireStore.jvm.kt index 3bbeaae4..28a01a12 100644 --- a/network/src/jvmMain/kotlin/dev/datlag/burningseries/network/firebase/FireStore.jvm.kt +++ b/network/src/jvmMain/kotlin/dev/datlag/burningseries/network/firebase/FireStore.jvm.kt @@ -1,14 +1,9 @@ package dev.datlag.burningseries.network.firebase -import dev.datlag.burningseries.model.FirestoreDocument -import dev.datlag.burningseries.model.FirestoreQuery import dev.datlag.burningseries.model.HosterScraping -import dev.datlag.burningseries.model.common.suspendCatching import dev.datlag.burningseries.network.Firestore import dev.gitlive.firebase.auth.FirebaseUser import dev.gitlive.firebase.firestore.FirebaseFirestore -import io.ktor.client.statement.* -import io.ktor.http.* actual object FireStore { actual suspend fun getStreams( diff --git a/network/src/realmCompatible/kotlin/dev/datlag/burningseries/network/realm/RealmLoader.kt b/network/src/realmCompatible/kotlin/dev/datlag/burningseries/network/realm/RealmLoader.kt index f39f0108..af6355ea 100644 --- a/network/src/realmCompatible/kotlin/dev/datlag/burningseries/network/realm/RealmLoader.kt +++ b/network/src/realmCompatible/kotlin/dev/datlag/burningseries/network/realm/RealmLoader.kt @@ -1,13 +1,12 @@ package dev.datlag.burningseries.network.realm import dev.datlag.burningseries.model.common.suspendCatching -import dev.datlag.burningseries.network.state.NetworkStateSaver import io.realm.kotlin.mongodb.App import io.realm.kotlin.mongodb.Credentials import io.realm.kotlin.mongodb.User -import org.mongodb.kbson.BsonDocument import io.realm.kotlin.mongodb.ext.call import io.realm.kotlin.types.RealmAny +import org.mongodb.kbson.BsonDocument actual class RealmLoader(private val app: App?) { actual suspend fun login() {