fix major bug

mshdabiola · May 25, 2024 · 6730ccd · 6730ccd
1 parent 4691291
commit 6730ccd
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -92,6 +92,8 @@ kotlin {
         androidMain.dependencies {
             implementation(libs.compose.ui.tooling.preview)
             implementation(libs.androidx.activity.compose)
+            implementation(libs.kotlinx.coroutines.android)
+
         }
         commonMain.dependencies {
 //
@@ -135,9 +137,9 @@ kotlin {
                 }
             }
         }
-        configurations.commonMainApi {
-            exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-android")
-        }
+//        configurations.commonMainApi {
+//            exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-android")
+//        }
 
     }
 }

diff --git a/composeApp/src/androidMain/kotlin/com/mshdabiola/skeletonapp/SkeletonApplication.kt b/composeApp/src/androidMain/kotlin/com/mshdabiola/skeletonapp/SkeletonApplication.kt
@@ -22,7 +22,7 @@ class SkeletonApplication : Application() {
         super.onCreate()
 
         val logger = Logger(
-            loggerConfigInit(platformLogWriter(), Writer(this.filesDir)),
+            loggerConfigInit(platformLogWriter()),
             "AndroidLogger",
         )
         val logModule = module {
@@ -36,7 +36,7 @@ class SkeletonApplication : Application() {
                 KermitKoinLogger(Logger.withTag("koin")),
             )
             androidContext(this@SkeletonApplication)
-            modules(appModule, jankStatsModule)
+            modules(appModule, jankStatsModule,logModule)
         }
 
 //        if (packageName.contains("debug")) {

diff --git a/modules/database/build.gradle.kts b/modules/database/build.gradle.kts
@@ -9,4 +9,8 @@ android {
 }
 room {
     schemaDirectory("$projectDir/schemas")
-}
+}
+
+configurations.commonMainApi {
+            exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-android")
+        }
diff --git a/modules/database/src/androidMain/kotlin/com/mshdabiola/database/di/Platform.android.kt b/modules/database/src/androidMain/kotlin/com/mshdabiola/database/di/Platform.android.kt
@@ -24,5 +24,5 @@ fun getDatabaseBuilder(context: Context): RoomDatabase.Builder<SkeletonDatabase>
         context = appContext,
         name = dbFile.absolutePath,
     )
-        .setDriver(AndroidSQLiteDriver())
+      //  .setDriver(AndroidSQLiteDriver())
 }
diff --git a/modules/ui/src/main/kotlin/com/mshdabiola/ui/FlowExt.android.kt b/modules/ui/src/main/kotlin/com/mshdabiola/ui/FlowExt.android.kt
@@ -13,12 +13,17 @@ import kotlinx.coroutines.flow.StateFlow
 
 @Composable
 actual fun <T> StateFlow<T>.collectAsStateWithLifecycleCommon(): State<T> {
-    return this.collectAsStateWithLifecycle()
+    return this.collectAsStateWithLifecycle(
+        lifecycleOwner = androidx.compose.ui.platform.LocalLifecycleOwner.current,
+        )
 }
 
 @Composable
 actual fun <T> Flow<T>.collectAsStateWithLifecycleCommon(initialValue: T): State<T> {
-    return this.collectAsStateWithLifecycle(initialValue = initialValue)
+    return this.collectAsStateWithLifecycle(
+        lifecycleOwner = androidx.compose.ui.platform.LocalLifecycleOwner.current,
+
+                initialValue = initialValue)
 }
 
 // val ViewModel.viewModelScope: CoroutineScope