Merge pull request #17 from makeevrserg/develop

Add towns preview

.gitignore

@@ -69,4 +69,5 @@ modules/features/onboard/build
 modules/features/ui/onboard/build
 modules/features/ui/splash/build
 modules/features/common/build
-modules/features/ui/common/build
+modules/features/ui/common/build
+modules/features/towns/build

gradle.properties

@@ -31,9 +31,6 @@ org.gradle.parallel=true
 kotlin.mpp.enableCInteropCommonization=true
 org.jetbrains.compose.experimental.uikit.enabled=true
 kotlin.native.binary.memoryModel=experimental
-kotlin.native.enableDependencyPropagation=false
-#kotlinOptions.useIR = true
-kotlin.mpp.enableGranularSourceSetsMetadata=true
 android.suppressUnsupportedCompileSdk=32
 kotlin.mpp.androidSourceSetLayoutVersion=2
 # Java
@@ -47,8 +44,8 @@ makeevrserg.android.sdk.target=34
 # Project
 makeevrserg.project.name=EmpireProjektMobile
 makeevrserg.project.group=com.makeevrserg.empireprojekt.mobile
-makeevrserg.project.version.string=0.2.4
-makeevrserg.project.version.code=11
+makeevrserg.project.version.string=0.3.0
+makeevrserg.project.version.code=12
 makeevrserg.project.description=EmpireProjekt mobile application
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
 # Kotlin
-kotlin-version = "1.9.10"
+kotlin-version = "1.9.22"
 kotlin-dokka = "1.8.10"
 kotlin-coroutines = "1.7.2"
-kotlin-compilerExtensionVersion = "1.5.3"
+kotlin-compilerExtensionVersion = "1.5.10"
 kotlin-android-application = "8.0.1"
 kotlin-serialization-json = "1.5.1"
 
 # Androidx
 androidx-lifecycle = "2.6.1"
 androidx-lifecycle-ext = "2.2.0"
-androidx-compose-bom = "2023.10.00"
+androidx-compose-bom = "2024.02.02"
 androidx-fragment = "1.6.1"
 androidx-core = "1.10.1"
 androidx-appcompat = "1.6.1"
@@ -50,12 +50,12 @@ ktor = "2.3.2-eap-692"
 coil = "2.2.2"
 
 # klibs
-klibs-mikro = "1.0.0"
+klibs-mikro = "1.5.0"
 klibs-kstorage = "1.0.0"
 klibs-kdi = "1.1.0"
 
 # Compose
-kotlin-compose = "1.5.3"
+kotlin-compose = "1.6.0"
 
 # Moko
 moko-mvvm = "0.16.1"
@@ -90,8 +90,10 @@ dokka = "1.8.10"
 # klibs
 klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" }
 klibs-mikro-platform = { module = "ru.astrainteractive.klibs:mikro-platform", version.ref = "klibs-mikro" }
+klibs-mikro-extensions = { module = "ru.astrainteractive.klibs:mikro-extensions", version.ref = "klibs-mikro" }
 klibs-kstorage = { module = "ru.astrainteractive.klibs:kstorage", version.ref = "klibs-kstorage" }
 klibs-kdi = { module = "ru.astrainteractive.klibs:kdi", version.ref = "klibs-kdi" }
+klibs-paging = { module = "ru.astrainteractive.klibs:paging", version.strictly = "2.0.0" }
 # dokka
 dokka-android = { module = "org.jetbrains.dokka:android-documentation-plugin", version.ref = "dokka" }
 dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
@@ -129,6 +131,7 @@ decompose-android = { module = "com.arkivanov.decompose:extensions-android", ver
 essenty = { module = "com.arkivanov.essenty:lifecycle", version.ref = "essenty" }
 # Kotlin
 kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" }
+kotlin-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.strictly = "0.4.0" }
 kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
 kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlin-coroutines" }
 kotlin-coroutines-javafx = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-javafx", version.ref = "kotlin-coroutines" }
@@ -205,6 +208,9 @@ moko-resources-compose = { module = "dev.icerock.moko:resources-compose", versio
 # Other
 coil = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
 
+# Compose ext
+composeext-shimmer = { module = "com.valentinilk.shimmer:compose-shimmer", version.strictly = "1.2.0" }
+
 # Okio
 okio = { module = "com.squareup.okio:okio", version.strictly = "3.3.0" }
 

modules/features/rating/build.gradle.kts

@@ -28,7 +28,7 @@ kotlin {
                 // Moko
                 implementation(libs.moko.resources.core)
                 // Paging
-                implementation("ru.astrainteractive.klibs:paging:1.0.0")
+                implementation(libs.klibs.paging)
                 // Coroutines
                 implementation(libs.kotlin.coroutines.core)
                 // MVIKotlin

modules/features/rating/src/commonMain/kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/user/DefaultRatingUserComponent.kt

@@ -29,25 +29,18 @@ class DefaultRatingUserComponent(
     )
 
     private fun collectPagingState() = coroutineFeature.launch {
-        repository.pagingStateFlow.collectLatest {
+        repository.state.collectLatest {
             model.update { model ->
                 model.copy(
                     isLastPage = it.isLastPage,
                     isLoading = it.isLoading,
-                    isFailure = it.isFailure
+                    isFailure = it.isFailure,
+                    items = it.items
                 )
             }
         }
     }
 
-    private fun collectListStateFlow() = coroutineFeature.launch {
-        repository.listStateFlow.collectLatest {
-            model.update { model ->
-                model.copy(items = it)
-            }
-        }
-    }
-
     override fun reset() {
         coroutineFeature.launch {
             repository.reset()
@@ -56,7 +49,6 @@ class DefaultRatingUserComponent(
     }
 
     override fun loadNextPage() {
-        println("LoadingNextPage")
         coroutineFeature.launch {
             repository.loadNextPage()
         }
@@ -65,6 +57,5 @@ class DefaultRatingUserComponent(
     init {
         repository.updateRequest(model.value.request)
         collectPagingState()
-        collectListStateFlow()
     }
 }

modules/features/rating/src/commonMain/kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/user/data/RatingUserRepository.kt

@@ -3,13 +3,12 @@ package com.makeevrserg.empireprojekt.mobile.features.rating.user.data
 import kotlinx.coroutines.flow.StateFlow
 import ru.astrainteractive.empireapi.models.rating.RatingModel
 import ru.astrainteractive.empireapi.models.rating.UserRatingsRequest
+import ru.astrainteractive.klibs.paging.context.IntPageContext
 import ru.astrainteractive.klibs.paging.state.PagingState
 
 interface RatingUserRepository {
 
-    val pagingStateFlow: StateFlow<PagingState<Int>>
-
-    val listStateFlow: StateFlow<List<RatingModel>>
+    val state: StateFlow<PagingState<RatingModel, IntPageContext>>
 
     suspend fun reset()
 

modules/features/rating/src/commonMain/kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/user/data/RatingUserRepositoryImpl.kt

@@ -2,13 +2,16 @@ package com.makeevrserg.empireprojekt.mobile.features.rating.user.data
 
 import com.makeevrserg.empireprojekt.mobile.api.empireapi.RatingApi
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
 import ru.astrainteractive.empireapi.models.rating.RatingModel
 import ru.astrainteractive.empireapi.models.rating.UserRatingsRequest
 import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers
 import ru.astrainteractive.klibs.paging.IntPagerCollector
+import ru.astrainteractive.klibs.paging.context.IntPageContext
 import ru.astrainteractive.klibs.paging.data.LambdaPagedListDataSource
+import ru.astrainteractive.klibs.paging.state.PagingState
 
 class RatingUserRepositoryImpl(
     private val ratingApi: RatingApi,
@@ -19,13 +22,11 @@ class RatingUserRepositoryImpl(
     private val pagingCollector = IntPagerCollector(
         initialPage = 0,
         pager = LambdaPagedListDataSource {
-            loadPage(it.pageDescriptor)
+            loadPage(it.pageContext.page)
         }
     )
 
-    override val pagingStateFlow = pagingCollector.pagingStateFlow
-
-    override val listStateFlow = pagingCollector.listStateFlow
+    override val state: StateFlow<PagingState<RatingModel, IntPageContext>> = pagingCollector.state
 
     private suspend fun loadPage(page: Int): Result<List<RatingModel>> {
         return runCatching {
@@ -44,8 +45,6 @@ class RatingUserRepositoryImpl(
     }
 
     override suspend fun loadNextPage() {
-        println("LoadingNextPage in repository")
-        println(pagingCollector.pagingStateFlow.value)
         pagingCollector.loadNextPage()
     }
 

modules/features/rating/src/commonMain/kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/users/data/RatingUsersRepository.kt

@@ -3,12 +3,12 @@ package com.makeevrserg.empireprojekt.mobile.features.rating.users.data
 import kotlinx.coroutines.flow.StateFlow
 import ru.astrainteractive.empireapi.models.rating.RatingListRequest
 import ru.astrainteractive.empireapi.models.rating.RatingUserModel
+import ru.astrainteractive.klibs.paging.context.IntPageContext
 import ru.astrainteractive.klibs.paging.state.PagingState
 
 interface RatingUsersRepository {
     fun updateRequest(request: RatingListRequest)
     suspend fun loadNextPage()
     suspend fun reset()
-    val pagingStateFlow: StateFlow<PagingState<Int>>
-    val listStateFlow: StateFlow<List<RatingUserModel>>
+    val state: StateFlow<PagingState<RatingUserModel, IntPageContext>>
 }

modules/features/rating/src/commonMain/kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/users/data/RatingUsersRepositoryImpl.kt

@@ -2,13 +2,16 @@ package com.makeevrserg.empireprojekt.mobile.features.rating.users.data
 
 import com.makeevrserg.empireprojekt.mobile.api.empireapi.RatingApi
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
 import ru.astrainteractive.empireapi.models.rating.RatingListRequest
 import ru.astrainteractive.empireapi.models.rating.RatingUserModel
 import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers
 import ru.astrainteractive.klibs.paging.IntPagerCollector
+import ru.astrainteractive.klibs.paging.context.IntPageContext
 import ru.astrainteractive.klibs.paging.data.LambdaPagedListDataSource
+import ru.astrainteractive.klibs.paging.state.PagingState
 
 class RatingUsersRepositoryImpl(
     private val ratingApi: RatingApi,
@@ -19,13 +22,11 @@ class RatingUsersRepositoryImpl(
     private val pagingCollector = IntPagerCollector(
         initialPage = 0,
         pager = LambdaPagedListDataSource {
-            loadPage(it.pageDescriptor)
+            loadPage(it.pageContext.page)
         }
     )
 
-    override val pagingStateFlow = pagingCollector.pagingStateFlow
-
-    override val listStateFlow = pagingCollector.listStateFlow
+    override val state: StateFlow<PagingState<RatingUserModel, IntPageContext>> = pagingCollector.state
 
     private suspend fun loadPage(page: Int): Result<List<RatingUserModel>> {
         return runCatching {

modules/features/rating/src/commonMain/kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/users/store/RatingUsersBootstrapper.kt

@@ -13,7 +13,6 @@ internal class RatingUsersBootstrapper(
 
     override fun invoke() {
         collectPagingState()
-        collectListStateFlow()
         updateRequestModel()
     }
 
@@ -22,14 +21,9 @@ internal class RatingUsersBootstrapper(
     }
 
     private fun collectPagingState() = scope.launch {
-        ratingUsersRepository.pagingStateFlow.collectLatest {
+        ratingUsersRepository.state.collectLatest {
             Action.PagingStateChanged(it).run(::dispatch)
-        }
-    }
-
-    private fun collectListStateFlow() = scope.launch {
-        ratingUsersRepository.listStateFlow.collectLatest {
-            Action.ListChanged(it).run(::dispatch)
+            Action.ListChanged(it.items).run(::dispatch)
         }
     }
 }

modules/features/rating/src/commonMain/kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/users/store/RatingUsersStore.kt

@@ -6,6 +6,7 @@ import com.makeevrserg.empireprojekt.mobile.features.rating.users.store.RatingUs
 import com.makeevrserg.empireprojekt.mobile.features.rating.users.store.RatingUsersStore.State
 import ru.astrainteractive.empireapi.models.rating.RatingListRequest
 import ru.astrainteractive.empireapi.models.rating.RatingUserModel
+import ru.astrainteractive.klibs.paging.context.IntPageContext
 import ru.astrainteractive.klibs.paging.state.PagingState
 
 interface RatingUsersStore : Store<Intent, State, Label> {
@@ -24,14 +25,14 @@ interface RatingUsersStore : Store<Intent, State, Label> {
 
     sealed interface Message {
         class ListChanged(val list: List<RatingUserModel>) : Message
-        class PagingStateChanged(val pagingState: PagingState<Int>) : Message
+        class PagingStateChanged(val pagingState: PagingState<RatingUserModel, IntPageContext>) : Message
     }
 
     object Label
 
     sealed interface Action {
         class ListChanged(val list: List<RatingUserModel>) : Action
-        class PagingStateChanged(val pagingState: PagingState<Int>) : Action
+        class PagingStateChanged(val pagingState: PagingState<RatingUserModel, IntPageContext>) : Action
         data object UpdateRequestModel : Action
     }
 }

modules/features/root/build.gradle.kts

@@ -74,6 +74,7 @@ kotlin {
                 api(projects.modules.features.rating)
                 api(projects.modules.features.theme)
                 api(projects.modules.features.status)
+                api(projects.modules.features.towns)
             }
         }
         val androidMain by getting {

modules/features/root/root.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'root'
-    spec.version                  = '0.2.2'
+    spec.version                  = '0.3.0'
     spec.homepage                 = 'https://empireprojekt.ru'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''
@@ -11,6 +11,17 @@ Pod::Spec.new do |spec|
     spec.ios.deployment_target = '16.0'
 
 
+    if !Dir.exist?('build/cocoapods/framework/Root.framework') || Dir.empty?('build/cocoapods/framework/Root.framework')
+        raise "
+
+        Kotlin framework 'Root' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :modules:features:root:generateDummyFramework
+
+        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
+    end
+
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':modules:features:root',
         'PRODUCT_MODULE_NAME' => 'Root',