Merge pull request #47 from stslex/dev

update all libs and refactor imnage loading

build-logic/convention/src/main/kotlin/com/stslex/wizard/convention/KmpCompose.kt

@@ -22,7 +22,6 @@ fun Project.configureKMPCompose(
             implementation(libs.findLibrary("kotlinx-collections-immutable").get())
             implementation(libs.findLibrary("koin-compose").get())
             implementation(libs.findLibrary("lifecycle-viewmodel").get())
-            implementation(libs.findLibrary("kamel").get())
         }
     }
 }

commonApp/proguard-rules.pro

@@ -18,4 +18,6 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-keep class io.ktor.** { *; }

commonApp/src/commonMain/kotlin/com/stslex/wizard/InitialApp.kt

@@ -51,7 +51,8 @@ fun InitialApp(
             val authScreen = Screen.Auth::class.simpleName.orEmpty()
             if (
                 isAuth.not() &&
-                currentScreen?.route?.contains(authScreen) == true
+                currentScreen != null &&
+                currentScreen.route?.contains(authScreen) == true
             ) {
                 navHostController.navigate(Screen.Auth)
             }
@@ -75,12 +76,10 @@ fun InitialApp(
             }
         }
     ) { _ ->
-        Box(
-            modifier = Modifier.fillMaxSize()
-        ) {
+        Box(modifier = Modifier.fillMaxSize()) {
             AppNavigationHost(
                 navHostController = navHostController,
-                startScreen = if (userStore.isAuth) Screen.Auth else Screen.FilmFeed
+                startScreen = if (userStore.isAuth) Screen.FilmFeed else Screen.Auth
             )
         }
     }

core/network/src/commonMain/kotlin/com/stslex/wizard/core/network/api/server/model/ErrorRefresh.kt → core/core/src/commonMain/kotlin/com/stslex/wizard/core/core/error/ErrorRefresh.kt

@@ -1,4 +1,4 @@
-package com.stslex.wizard.core.network.api.server.model
+package com.stslex.wizard.core.core.error
 
 /**
  * Error refresh token response

core/network/build.gradle.kts

@@ -14,7 +14,7 @@ kotlin {
             implementation(project(":core:database"))
             implementation(libs.bundles.ktor)
             implementation(libs.slf4j.simple)
-            implementation(libs.kamel)
+            implementation(libs.kotlinx.datetime)
         }
         buildConfig {
             setLocalProperty(project.rootProject)

core/network/src/commonMain/kotlin/com/stslex/wizard/core/network/api/server/error_handler/RefreshTokenValidator.kt

@@ -1,6 +1,6 @@
 package com.stslex.wizard.core.network.api.server.error_handler
 
-import com.stslex.wizard.core.network.api.server.model.ErrorRefresh
+import com.stslex.wizard.core.core.error.ErrorRefresh
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.CallRequestExceptionHandler
 import io.ktor.client.plugins.HttpResponseValidator

core/network/src/commonMain/kotlin/com/stslex/wizard/core/network/clients/match/client/MockMatchClientImpl.kt

@@ -7,8 +7,8 @@ import com.stslex.wizard.core.network.clients.match.model.response.MatchResponse
 import com.stslex.wizard.core.network.clients.match.model.response.MatchStatusResponse
 import com.stslex.wizard.core.network.clients.match.model.response.MatchUserResponse
 import com.stslex.wizard.core.network.model.PagingRequest
-import com.stslex.wizard.core.network.utils.currentTimeMs
 import kotlinx.coroutines.delay
+import kotlinx.datetime.Clock
 
 class MockMatchClientImpl : MatchClient {
 
@@ -62,7 +62,7 @@ class MockMatchClientImpl : MatchClient {
     }
 
     private fun createMatch(index: Int): MatchDetailResponse {
-        val created = currentTimeMs
+        val created = Clock.System.now().epochSeconds
         val updated = created + 1000 * 60 * 60
         val expires = created + 1000 * 60 * 60 * 24
         return MatchDetailResponse(

core/ui/build.gradle.kts

@@ -7,13 +7,16 @@ kotlin {
         commonMain.dependencies {
             implementation(project(":core:core"))
             implementation(project(":core:network"))
-        }
-        androidMain.dependencies {
-            api(libs.coil.compose)
+            implementation(libs.kotlinx.datetime)
+            implementation(libs.bundles.coil)
+            implementation(libs.bundles.ktor)
+            implementation(libs.slf4j.simple)
         }
         iosMain.dependencies {
-            // TODO research TLS PROBLEM
-            implementation(libs.ktor.client.darwin)
+            api(libs.ktor.client.darwin)
+        }
+        androidMain.dependencies {
+            api(libs.ktor.client.android)
         }
     }
 }

core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/AppError.kt

@@ -1,7 +1,7 @@
 package com.stslex.wizard.core.ui.base
 
 import androidx.compose.runtime.Stable
-import com.stslex.wizard.core.network.api.server.model.ErrorRefresh
+import com.stslex.wizard.core.core.error.ErrorRefresh
 
 @Stable
 sealed class AppError(open val message: String) {

core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/Clicker.kt

@@ -3,9 +3,9 @@ package com.stslex.wizard.core.ui.base
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import com.stslex.wizard.core.network.utils.currentTimeMs
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.datetime.Clock
 
 private class Clicker(
     private val throttle: Long = 500
@@ -14,7 +14,7 @@ private class Clicker(
     private var lastClickTime = 0L
 
     fun click(onClick: () -> Unit) {
-        val currentTime = currentTimeMs
+        val currentTime = Clock.System.now().epochSeconds
         if (currentTime - lastClickTime < throttle) {
             return
         }

core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/image/AppImage.kt

@@ -0,0 +1,51 @@
+package com.stslex.wizard.core.ui.base.image
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import coil3.ImageLoader
+import coil3.compose.LocalPlatformContext
+import coil3.compose.rememberAsyncImagePainter
+import coil3.network.ktor3.KtorNetworkFetcherFactory
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.cio.CIO
+
+// todo refactor
+private var imageLoader: ImageLoader? = null
+
+@Composable
+internal fun rememberImageLoader(): ImageLoader {
+    val platformContext = LocalPlatformContext.current
+    return remember {
+        imageLoader ?: ImageLoader
+            .Builder(platformContext)
+            .components { add(KtorNetworkFetcherFactory(HttpClient(CIO))) }
+            .build()
+    }
+}
+
+@Composable
+fun AppImage(
+    url: String,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+    contentScale: ContentScale = ContentScale.Fit,
+    onLoading: @Composable (BoxScope.(Float) -> Unit)? = null,
+    onFailure: @Composable (BoxScope.(Throwable) -> Unit)? = null,
+) {
+    val imageLoader = rememberImageLoader()
+    val painter = rememberAsyncImagePainter(
+        model = url,
+        imageLoader = imageLoader,
+    )
+    // todo add states
+    Image(
+        modifier = modifier,
+        painter = painter,
+        contentDescription = contentDescription,
+        contentScale = contentScale
+    )
+}

feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/components/FilmContentScreen.kt

@@ -53,7 +53,7 @@ import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
 import com.stslex.wizard.core.ui.base.SwipeScrollConnection
 import com.stslex.wizard.core.ui.base.SwipeState
-import com.stslex.wizard.core.ui.base.image.NetworkImage
+import com.stslex.wizard.core.ui.base.image.AppImage
 import com.stslex.wizard.core.ui.base.onClick
 import com.stslex.wizard.core.ui.base.onClickDelay
 import com.stslex.wizard.core.ui.theme.AppDimension
@@ -408,7 +408,7 @@ internal fun FilmHeader(
     title: String,
     modifier: Modifier = Modifier,
 ) {
-    NetworkImage(
+    AppImage(
         modifier = modifier
             .fillMaxWidth(),
         url = url,

feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/FeedScreen.kt

@@ -2,6 +2,7 @@ package com.stslex.wizard.feature.film_feed.ui
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -19,7 +20,9 @@ internal fun FeedScreen(
     sendAction: (Action) -> Unit,
 ) {
     Box(
-        modifier = modifier.fillMaxSize()
+        modifier = modifier
+            .fillMaxSize()
+            .statusBarsPadding()
     ) {
         when (val screenState = state.screen) {
             is ScreenState.Content -> FeedScreenContent(