-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- split api/impl modules - add tab module
- Loading branch information
Showing
54 changed files
with
515 additions
and
225 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,7 @@ org.jetbrains.compose.experimental.uikit.enabled=true | |
| kotlin.mpp.enableCInteropCommonization=true | ||
| kotlin.native.binary.memoryModel=experimental | ||
| kotlin.mpp.androidSourceSetLayoutVersion=2 | ||
| kotlin.native.ignoreDisabledTargets=true | ||
| kotlin.native.ignoreDisabcxledTargets=true | ||
| # Java | ||
| makeevrserg.java.source=11 | ||
| makeevrserg.java.target=17 | ||
|
|
@@ -45,8 +45,8 @@ makeevrserg.android.sdk.target=34 | |
| # Project | ||
| makeevrserg.project.name=EmpireProjektMobile | ||
| makeevrserg.project.group=com.makeevrserg.empireprojekt.mobile | ||
| makeevrserg.project.version.string=0.7.0 | ||
| makeevrserg.project.version.code=24 | ||
| makeevrserg.project.version.string=0.7.1 | ||
| makeevrserg.project.version.code=25 | ||
| makeevrserg.project.description=EmpireProjekt mobile application | ||
| makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected] | ||
| makeevrserg.project.url=https://empireprojekt.ru | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| @file:Suppress("UnusedPrivateMember") | ||
|
|
||
| import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo | ||
|
|
||
| plugins { | ||
| id("com.android.library") | ||
| kotlin("multiplatform") | ||
| id("ru.astrainteractive.gradleplugin.java.core") | ||
| id("ru.astrainteractive.gradleplugin.android.core") | ||
| alias(libs.plugins.kotlin.serialization) | ||
| } | ||
|
|
||
| kotlin { | ||
| androidTarget() | ||
| applyDefaultHierarchyTemplate() | ||
| sourceSets { | ||
| val commonMain by getting { | ||
| dependencies { | ||
| // Coroutines | ||
| implementation(libs.kotlin.coroutines.core) | ||
| implementation(libs.decompose.core) | ||
| implementation(projects.modules.services.apiEmpireapi) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| android { | ||
| namespace = "${requireProjectInfo.group}.rating.api" | ||
| } |
12 changes: 12 additions & 0 deletions
12
...n/kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/user/di/RatingUserModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.makeevrserg.empireprojekt.mobile.features.rating.user.di | ||
|
|
||
| import com.arkivanov.decompose.ComponentContext | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.user.presentation.RatingUserComponent | ||
|
|
||
| interface RatingUserModule { | ||
| fun createRatingUserComponent( | ||
| componentContext: ComponentContext, | ||
| userId: Long, | ||
| userName: String | ||
| ): RatingUserComponent | ||
| } |
File renamed without changes.
11 changes: 11 additions & 0 deletions
11
...kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/users/di/RatingUsersModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package com.makeevrserg.empireprojekt.mobile.features.rating.users.di | ||
|
|
||
| import com.arkivanov.decompose.ComponentContext | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.users.presentation.RatingUsersComponent | ||
|
|
||
| interface RatingUsersModule { | ||
| fun createRatingUsersComponent( | ||
| componentContext: ComponentContext, | ||
| onShowUserRatingsClicked: (userId: Long, userName: String) -> Unit | ||
| ): RatingUsersComponent | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 0 additions & 41 deletions
41
...n/kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/user/di/RatingUserModule.kt
This file was deleted.
Oops, something went wrong.
33 changes: 33 additions & 0 deletions
33
...tlin/com/makeevrserg/empireprojekt/mobile/features/rating/user/di/RatingUserModuleImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.makeevrserg.empireprojekt.mobile.features.rating.user.di | ||
|
|
||
| import com.arkivanov.decompose.ComponentContext | ||
| import com.makeevrserg.empireprojekt.mobile.api.empireapi.di.ApiEmpireApiModule | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.user.data.RatingUserRepositoryImpl | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.user.presentation.DefaultRatingUserComponent | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.user.presentation.RatingUserComponent | ||
| import com.makeevrserg.empireprojekt.mobile.services.core.di.CoreModule | ||
|
|
||
| class RatingUserModuleImpl( | ||
| apiEmpireApiModule: ApiEmpireApiModule, | ||
| coreModule: CoreModule | ||
| ) : RatingUserModule { | ||
| private val ratingUserRepository by lazy { | ||
| RatingUserRepositoryImpl( | ||
| ratingApi = apiEmpireApiModule.ratingApi, | ||
| dispatchers = coreModule.dispatchers | ||
| ) | ||
| } | ||
|
|
||
| override fun createRatingUserComponent( | ||
| componentContext: ComponentContext, | ||
| userId: Long, | ||
| userName: String | ||
| ): RatingUserComponent { | ||
| return DefaultRatingUserComponent( | ||
| componentContext = componentContext, | ||
| userId = userId, | ||
| userName = userName, | ||
| ratingUserRepository = ratingUserRepository | ||
| ) | ||
| } | ||
| } |
58 changes: 0 additions & 58 deletions
58
...kotlin/com/makeevrserg/empireprojekt/mobile/features/rating/users/di/RatingUsersModule.kt
This file was deleted.
Oops, something went wrong.
51 changes: 51 additions & 0 deletions
51
...in/com/makeevrserg/empireprojekt/mobile/features/rating/users/di/RatingUsersModuleImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package com.makeevrserg.empireprojekt.mobile.features.rating.users.di | ||
|
|
||
| import com.arkivanov.decompose.ComponentContext | ||
| import com.makeevrserg.empireprojekt.mobile.api.empireapi.di.ApiEmpireApiModule | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.users.data.RatingUsersRepository | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.users.data.RatingUsersRepositoryImpl | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.users.presentation.DefaultRatingUsersComponent | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.users.presentation.RatingUsersComponent | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.users.presentation.feature.FilterFeature | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.users.presentation.feature.RatingUsersFeature | ||
| import com.makeevrserg.empireprojekt.mobile.features.rating.users.storage.RatingsFilterStorageValue | ||
| import com.makeevrserg.empireprojekt.mobile.services.core.di.CoreModule | ||
|
|
||
| class RatingUsersModuleImpl( | ||
| apiEmpireApiModule: ApiEmpireApiModule, | ||
| private val coreModule: CoreModule | ||
| ) : RatingUsersModule { | ||
| private val ratingUsersRepository: RatingUsersRepository by lazy { | ||
| RatingUsersRepositoryImpl( | ||
| ratingApi = apiEmpireApiModule.ratingApi, | ||
| dispatchers = coreModule.dispatchers, | ||
| ) | ||
| } | ||
|
|
||
| override fun createRatingUsersComponent( | ||
| componentContext: ComponentContext, | ||
| onShowUserRatingsClicked: (userId: Long, userName: String) -> Unit | ||
| ): RatingUsersComponent { | ||
| val dependencies = RatingUsersDependencies.Default( | ||
| ratingUsersRepository = ratingUsersRepository | ||
| ) | ||
| return DefaultRatingUsersComponent( | ||
| componentContext = componentContext, | ||
| onShowUserRatingsClicked = onShowUserRatingsClicked, | ||
| createRatingUsersFeature = { filterProvider -> | ||
| RatingUsersFeature( | ||
| dependencies = dependencies, | ||
| filterProvider = filterProvider | ||
| ) | ||
| }, | ||
| createFilterFeature = { | ||
| FilterFeature( | ||
| ratingsFilterStorageValue = RatingsFilterStorageValue( | ||
| settings = coreModule.settings, | ||
| key = "ratings_filter_storage_key" | ||
| ) | ||
| ) | ||
| } | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...commonMain/kotlin/com/makeevrserg/empireprojekt/mobile/features/root/screen/RootRouter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.