Merge pull request #40 from stslex/dev

Refactor Paging worker
stslex · Oct 27, 2024 · 299a827 · 299a827
2 parents bb9aa04 + 3400324
commit 299a827
Show file tree

Hide file tree

Showing 116 changed files with 2,170 additions and 2,185 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -33,31 +33,4 @@ jobs:
         run: echo "$LOCAL_PROPERTIES" > ./local.properties
 
       - name: Build with Gradle
-        run: ./gradlew assembleAndroidTest
-
-  build-desktop:
-
-    runs-on: ubuntu-latest
-
-    steps:
-
-      - name: Checkout branch
-        uses: actions/checkout@v2
-
-      - name: set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: set up LOCAL_PROPERTIES
-        env:
-          LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }}
-        run: echo "$LOCAL_PROPERTIES" > ./local.properties
-
-      - name: Build with Gradle
-        run: ./gradlew desktopMainClasses desktopSourcesJar desktopTestClasses
+        run: ./gradlew assembleAndroidTest
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
@@ -16,8 +14,6 @@ kotlin {
         }
     }
 
-    jvm("desktop")
-
     iosX64()
     iosArm64()
     iosSimulatorArm64()
@@ -35,11 +31,6 @@ kotlin {
     }
 
     sourceSets {
-        val desktopMain by getting
-
-        desktopMain.dependencies {
-            implementation(compose.desktop.currentOs)
-        }
 
         commonMain.dependencies {
             implementation(project(":core:core"))
@@ -106,18 +97,6 @@ dependencies {
     implementation(project(":feature:settings"))
 }
 
-compose.desktop {
-    application {
-        mainClass = "MainKt"
-
-        nativeDistributions {
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "com.stslex.wizard"
-            packageVersion = "1.0.0"
-        }
-    }
-}
-
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     compilerOptions.freeCompilerArgs.addAll(
         "-P",

diff --git a/composeApp/src/desktopMain/kotlin/main.kt b/composeApp/src/desktopMain/kotlin/main.kt
diff --git a/core/core/build.gradle.kts b/core/core/build.gradle.kts
@@ -15,8 +15,6 @@ kotlin {
         }
     }
 
-    jvm("desktop")
-
     iosX64()
     iosArm64()
     iosSimulatorArm64()

diff --git a/core/core/src/commonMain/kotlin/com/stslex/core/core/paging/PagingCoreData.kt b/core/core/src/commonMain/kotlin/com/stslex/core/core/paging/PagingCoreData.kt
@@ -15,5 +15,8 @@ interface PagingCoreData<out T : PagingCoreItem> {
         const val DEFAULT_PAGING_TYPE = "ItemPaging"
         const val DEFAULT_APPEND_TYPE = "AppendPaging"
         const val DEFAULT_BOTTOM_TYPE = "BottomPaging"
+        const val DEFAULT_PAGING_DELAY = 300L
+        const val DEFAULT_PAGING_LOAD_SIZE = 3
+        const val DEFAULT_QUERY_LOAD_SIZE = 2
     }
 }
diff --git a/core/core/src/desktopMain/kotlin/com/stslex/core/core/CommonUtils.desktop.kt b/core/core/src/desktopMain/kotlin/com/stslex/core/core/CommonUtils.desktop.kt
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -15,8 +15,6 @@ kotlin {
         }
     }
 
-    jvm("desktop")
-
     iosX64()
     iosArm64()
     iosSimulatorArm64()

diff --git a/core/database/src/desktopMain/kotlin/com/stslex/core/database/di/DatabaseModel.desktop.kt b/core/database/src/desktopMain/kotlin/com/stslex/core/database/di/DatabaseModel.desktop.kt
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -19,8 +19,6 @@ kotlin {
         }
     }
 
-    jvm("desktop")
-
     iosX64()
     iosArm64()
     iosSimulatorArm64()

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.compose.ExperimentalComposeLibrary
-
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)
@@ -16,8 +14,6 @@ kotlin {
         }
     }
 
-    jvm("desktop")
-
     iosX64()
     iosArm64()
     iosSimulatorArm64()
@@ -33,11 +29,6 @@ kotlin {
     }
 
     sourceSets {
-        val desktopMain by getting
-
-        desktopMain.dependencies {
-            implementation(compose.desktop.currentOs)
-        }
 
         commonMain.dependencies {
             implementation(project(":core:core"))
@@ -47,10 +38,11 @@ kotlin {
             api(compose.foundation)
             api(compose.material)
             api(compose.material3)
-            @OptIn(ExperimentalComposeLibrary::class)
             api(compose.components.resources)
             api(libs.bundles.voyager)
             api(libs.kamel)
+
+            implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.8.0-beta02")
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)

diff --git a/core/ui/src/androidMain/kotlin/com/stslex/core/ui/mvi/StoreExt.android.kt b/core/ui/src/androidMain/kotlin/com/stslex/core/ui/mvi/StoreExt.android.kt
@@ -0,0 +1,16 @@
+package com.stslex.core.ui.mvi
+
+import androidx.lifecycle.ViewModel
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.definition.Definition
+import org.koin.core.definition.KoinDefinition
+import org.koin.core.module.Module
+import org.koin.core.qualifier.Qualifier
+
+actual inline fun <reified T : ViewModel> Module.viewModelDefinition(
+    qualifier: Qualifier?,
+    noinline definition: Definition<T>,
+): KoinDefinition<T> = viewModel(
+    qualifier = qualifier,
+    definition = definition
+)
diff --git a/core/ui/src/commonMain/kotlin/com/stslex/core/ui/base/paging/PagingConfig.kt b/core/ui/src/commonMain/kotlin/com/stslex/core/ui/base/paging/PagingConfig.kt
@@ -6,14 +6,20 @@ import com.stslex.core.core.paging.PagingCoreData
 @Stable
 data class PagingConfig(
     val pageSize: Int,
-    val pageOffset: Float = PagingCoreData.DEFAULT_PAGE_OFFSET
+    val pageOffset: Float = PagingCoreData.DEFAULT_PAGE_OFFSET,
+    val delay: Long = PagingCoreData.DEFAULT_PAGING_DELAY,
+    val defaultLoadSize: Int = PagingCoreData.DEFAULT_PAGING_LOAD_SIZE,
+    val queryLoadSize: Int = PagingCoreData.DEFAULT_QUERY_LOAD_SIZE
 ) {
 
     companion object {
 
         val DEFAULT = PagingConfig(
             pageSize = PagingCoreData.DEFAULT_PAGE_SIZE,
-            pageOffset = PagingCoreData.DEFAULT_PAGE_OFFSET
+            pageOffset = PagingCoreData.DEFAULT_PAGE_OFFSET,
+            delay = PagingCoreData.DEFAULT_PAGING_DELAY,
+            defaultLoadSize = PagingCoreData.DEFAULT_PAGING_LOAD_SIZE,
+            queryLoadSize = PagingCoreData.DEFAULT_QUERY_LOAD_SIZE
         )
     }
 }
diff --git a/core/ui/src/commonMain/kotlin/com/stslex/core/ui/di/CoreUiModule.kt b/core/ui/src/commonMain/kotlin/com/stslex/core/ui/di/CoreUiModule.kt
@@ -2,10 +2,17 @@ package com.stslex.core.ui.di
 
 import com.stslex.core.ui.pager.pager.StorePagerFactory
 import com.stslex.core.ui.pager.pager.StorePagerFactoryImpl
+import com.stslex.core.ui.pager.paging_worker.PagingWorkerFactory
+import com.stslex.core.ui.pager.paging_worker.PagingWorkerFactoryImpl
 import org.koin.dsl.module
 
 val coreUiModule = module {
+    factory<PagingWorkerFactory> {
+        PagingWorkerFactoryImpl()
+    }
     factory<StorePagerFactory> {
-        StorePagerFactoryImpl()
+        StorePagerFactoryImpl(
+            workerFactory = get()
+        )
     }
 }
diff --git a/core/ui/src/commonMain/kotlin/com/stslex/core/ui/mvi/BaseStore.kt b/core/ui/src/commonMain/kotlin/com/stslex/core/ui/mvi/BaseStore.kt