From 49a12c98bc37eb110059801150f434fe3fab3958 Mon Sep 17 00:00:00 2001 From: stslex Date: Sun, 1 Dec 2024 15:54:49 +0300 Subject: [PATCH] init image ui module --- commonApp/build.gradle.kts | 2 +- .../kotlin/com/stslex/wizard/App.kt | 2 +- .../kotlin/com/stslex/wizard/di/appModule.kt | 2 +- core/navigation/build.gradle.kts | 2 +- core/ui/image/build.gradle.kts | 21 ++++++++++++++++++ core/ui/{ => kit}/build.gradle.kts | 0 .../core/ui/kit}/mvi/StoreExt.android.kt | 2 +- .../kit}/viewModel/ViewModelBean.android.kt | 2 +- .../wizard/core/ui/kit}/base/Animations.kt | 4 ++-- .../wizard/core/ui/kit}/base/AppError.kt | 2 +- .../wizard/core/ui/kit}/base/Clicker.kt | 2 +- .../ui/kit}/base/SwipeScrollConnection.kt | 2 +- .../wizard/core/ui/kit}/base/SwipeState.kt | 2 +- .../core/ui/kit}/base/image/AppImage.kt | 2 +- .../core/ui/kit}/base/image/ImageType.kt | 2 +- .../core/ui/kit}/base/paging/PagingColumn.kt | 6 ++--- .../core/ui/kit}/base/paging/PagingConfig.kt | 2 +- .../core/ui/kit}/base/paging/PagingItem.kt | 2 +- .../core/ui/kit}/base/paging/PagingState.kt | 2 +- .../core/ui/kit}/base/paging/PagingUiState.kt | 2 +- .../subcompose/DimensionSubComposeLayout.kt | 2 +- .../ui/kit/base/subcompose/SubComposeType.kt | 6 +++++ .../core/ui/kit}/components/AppSnackbar.kt | 6 ++--- .../core/ui/kit}/components/AppToolbar.kt | 4 ++-- .../ui/kit}/components/SnackbarSwipeState.kt | 2 +- .../core/ui/kit}/components/SnackbarType.kt | 2 +- .../wizard/core/ui/kit}/di/ModuleCoreUi.kt | 10 ++++----- .../wizard/core/ui/kit}/mvi/BaseStore.kt | 8 +++---- .../wizard/core/ui/kit}/mvi/CommonEvents.kt | 4 ++-- .../stslex/wizard/core/ui/kit}/mvi/Router.kt | 2 +- .../stslex/wizard/core/ui/kit}/mvi/Store.kt | 8 +++---- .../wizard/core/ui/kit}/mvi/StoreBean.kt | 4 ++-- .../wizard/core/ui/kit}/mvi/StoreExt.kt | 2 +- .../core/ui/kit}/pager/mapper/PagingMapper.kt | 4 ++-- .../core/ui/kit}/pager/pager/StorePager.kt | 10 ++++----- .../ui/kit}/pager/pager/StorePagerFactory.kt | 8 +++---- .../kit}/pager/pager/StorePagerFactoryImpl.kt | 10 ++++----- .../ui/kit}/pager/pager/StorePagerImpl.kt | 22 +++++++++---------- .../pager/paging_worker/PagingRequestType.kt | 6 +++++ .../kit}/pager/paging_worker/PagingWorker.kt | 2 +- .../paging_worker/PagingWorkerFactory.kt | 3 ++- .../paging_worker/PagingWorkerFactoryImpl.kt | 2 +- .../pager/paging_worker/PagingWorkerImpl.kt | 2 +- .../ui/kit/pager/states/PagerLoadEvents.kt | 8 +++++++ .../ui/kit}/pager/states/PagerLoadState.kt | 4 ++-- .../wizard/core/ui/kit}/theme/AppDimension.kt | 2 +- .../wizard/core/ui/kit}/theme/AppTheme.kt | 2 +- .../wizard/core/ui/kit}/theme/DimenExt.kt | 2 +- .../core/ui/kit}/viewModel/ViewModelBean.kt | 2 +- .../wizard/core/ui/kit}/mvi/StoreExt.ios.kt | 2 +- .../ui/kit}/viewModel/ViewModelBean.ios.kt | 2 +- .../core/ui/base/subcompose/SubComposeType.kt | 6 ----- .../pager/paging_worker/PagingRequestType.kt | 6 ----- .../core/ui/pager/states/PagerLoadEvents.kt | 8 ------- feature/auth/build.gradle.kts | 2 +- .../feature/auth/di/ModuleFeatureAuth.kt | 2 +- .../feature/auth/navigation/AuthGraph.kt | 2 +- .../feature/auth/navigation/AuthRouter.kt | 2 +- .../wizard/feature/auth/ui/AuthScreen.kt | 6 ++--- .../auth/ui/components/AuthFieldsColumn.kt | 2 +- .../feature/auth/ui/components/AuthTitle.kt | 2 +- .../wizard/feature/auth/ui/store/AuthStore.kt | 4 ++-- .../feature/auth/ui/store/AuthStoreImpl.kt | 4 ++-- feature/favourite/build.gradle.kts | 2 +- .../favourite/di/ModuleFeatureFavourite.kt | 2 +- .../favourite/navigation/FavouriteGraph.kt | 2 +- .../favourite/navigation/FavouriteRouter.kt | 2 +- .../content/FavouriteScreenContent.kt | 6 ++--- .../content/FavouriteScreenContentItem.kt | 2 +- .../content/FavouriteScreenContentLoading.kt | 2 +- .../content/FavouriteScreenSearchField.kt | 2 +- .../shimmer/FavouriteScreenShimmer.kt | 4 ++-- .../favourite/ui/model/FavouriteModel.kt | 2 +- .../ui/store/FavouriteScreenState.kt | 4 ++-- .../favourite/ui/store/FavouriteStore.kt | 8 +++---- .../favourite/ui/store/FavouriteStoreImpl.kt | 14 ++++++------ feature/film/build.gradle.kts | 2 +- .../feature/film/di/ModuleFeatureFilm.kt | 2 +- .../feature/film/navigation/FilmRouter.kt | 2 +- .../feature/film/navigation/GraphFilm.kt | 2 +- .../film/ui/components/FilmContentScreen.kt | 16 +++++++------- .../wizard/feature/film/ui/store/FilmStore.kt | 2 +- .../feature/film/ui/store/FilmStoreImpl.kt | 2 +- feature/film_feed/build.gradle.kts | 2 +- .../feature/film_feed/di/ModuleFeatureFeed.kt | 2 +- .../film_feed/navigation/FeedScreenRouter.kt | 2 +- .../film_feed/navigation/GraphFilmFeed.kt | 2 +- .../ui/components/FeedScreenFilmItem.kt | 6 ++--- .../feature/film_feed/ui/store/FeedStore.kt | 2 +- .../film_feed/ui/store/FeedStoreImpl.kt | 2 +- feature/follower/build.gradle.kts | 2 +- .../follower/di/ModuleFeatureFollower.kt | 2 +- .../follower/navigation/FollowerRouter.kt | 2 +- .../follower/navigation/GraphFollower.kt | 2 +- .../feature/follower/ui/FollowerScreen.kt | 2 +- .../follower/ui/model/FollowerModel.kt | 2 +- .../follower/ui/store/FollowerScreenState.kt | 4 ++-- .../follower/ui/store/FollowerStore.kt | 8 +++---- .../follower/ui/store/FollowerStoreImpl.kt | 14 ++++++------ feature/match/build.gradle.kts | 2 +- .../match/data/model/MatchDataModel.kt | 2 +- .../feature/match/di/ModuleFeatureMatch.kt | 2 +- .../match/domain/model/MatchDomainModel.kt | 2 +- .../feature/match/navigation/GraphMatch.kt | 2 +- .../feature/match/navigation/MatchRouter.kt | 2 +- .../wizard/feature/match/ui/MatchScreen.kt | 2 +- .../match/ui/components/MatchScreenContent.kt | 8 +++---- .../match/ui/components/MatchScreenError.kt | 4 ++-- .../feature/match/ui/model/MatchDataMapper.kt | 2 +- .../feature/match/ui/model/MatchUiModel.kt | 2 +- .../match/ui/store/MatchScreenState.kt | 2 +- .../feature/match/ui/store/MatchStore.kt | 8 +++---- .../feature/match/ui/store/MatchStoreImpl.kt | 14 ++++++------ feature/match_feed/build.gradle.kts | 2 +- .../match_feed/di/ModuleFeatureMatchFeed.kt | 2 +- .../match_feed/navigation/GraphMatchFeed.kt | 2 +- .../match_feed/navigation/MatchFeedRouter.kt | 2 +- .../ui/components/MatchFeedScreenFilmItem.kt | 6 ++--- .../match_feed/ui/store/MatchFeedStore.kt | 2 +- .../match_feed/ui/store/MatchFeedStoreImpl.kt | 2 +- feature/profile/build.gradle.kts | 2 +- .../profile/di/ModuleFeatureProfile.kt | 2 +- .../profile/navigation/GraphProfile.kt | 2 +- .../profile/navigation/ProfileRouter.kt | 2 +- .../feature/profile/ui/ProfileScreen.kt | 4 ++-- .../profile/ui/components/ProfileAvatar.kt | 4 ++-- .../profile/ui/components/ProfileInfo.kt | 2 +- .../ui/components/ProfileScreenToolbar.kt | 2 +- .../feature/profile/ui/store/ProfileStore.kt | 4 ++-- .../profile/ui/store/ProfileStoreImpl.kt | 4 ++-- feature/settings/build.gradle.kts | 2 +- .../settings/di/ModuleFeatureSettings.kt | 2 +- .../settings/navigation/GraphSettings.kt | 2 +- .../settings/navigation/SettingsRouter.kt | 2 +- .../feature/settings/ui/SettingsScreen.kt | 6 ++--- .../settings/ui/components/SettingsContent.kt | 2 +- .../settings/ui/store/SettingsStore.kt | 4 ++-- .../settings/ui/store/SettingsStoreImpl.kt | 4 ++-- settings.gradle.kts | 9 ++++++-- 139 files changed, 279 insertions(+), 252 deletions(-) create mode 100644 core/ui/image/build.gradle.kts rename core/ui/{ => kit}/build.gradle.kts (100%) rename core/ui/{src/androidMain/kotlin/com/stslex/wizard/core/ui => kit/src/androidMain/kotlin/com/stslex/wizard/core/ui/kit}/mvi/StoreExt.android.kt (91%) rename core/ui/{src/androidMain/kotlin/com/stslex/wizard/core/ui => kit/src/androidMain/kotlin/com/stslex/wizard/core/ui/kit}/viewModel/ViewModelBean.android.kt (97%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/Animations.kt (97%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/AppError.kt (93%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/Clicker.kt (96%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/SwipeScrollConnection.kt (97%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/SwipeState.kt (54%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/image/AppImage.kt (96%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/image/ImageType.kt (50%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/paging/PagingColumn.kt (94%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/paging/PagingConfig.kt (94%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/paging/PagingItem.kt (86%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/paging/PagingState.kt (96%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/paging/PagingUiState.kt (94%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/base/subcompose/DimensionSubComposeLayout.kt (95%) create mode 100644 core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/subcompose/SubComposeType.kt rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/components/AppSnackbar.kt (97%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/components/AppToolbar.kt (95%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/components/SnackbarSwipeState.kt (60%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/components/SnackbarType.kt (95%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/di/ModuleCoreUi.kt (57%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/mvi/BaseStore.kt (95%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/mvi/CommonEvents.kt (93%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/mvi/Router.kt (68%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/mvi/Store.kt (79%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/mvi/StoreBean.kt (94%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/mvi/StoreExt.kt (94%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/mapper/PagingMapper.kt (60%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/pager/StorePager.kt (54%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/pager/StorePagerFactory.kt (66%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/pager/StorePagerFactoryImpl.kt (74%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/pager/StorePagerImpl.kt (86%) create mode 100644 core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingRequestType.kt rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/paging_worker/PagingWorker.kt (90%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/paging_worker/PagingWorkerFactory.kt (66%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/paging_worker/PagingWorkerFactoryImpl.kt (88%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/paging_worker/PagingWorkerImpl.kt (98%) create mode 100644 core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/states/PagerLoadEvents.kt rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/pager/states/PagerLoadState.kt (77%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/theme/AppDimension.kt (92%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/theme/AppTheme.kt (94%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/theme/DimenExt.kt (93%) rename core/ui/{src/commonMain/kotlin/com/stslex/wizard/core/ui => kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit}/viewModel/ViewModelBean.kt (96%) rename core/ui/{src/iosMain/kotlin/com/stslex/wizard/core/ui => kit/src/iosMain/kotlin/com/stslex/wizard/core/ui/kit}/mvi/StoreExt.ios.kt (91%) rename core/ui/{src/iosMain/kotlin/com/stslex/wizard/core/ui => kit/src/iosMain/kotlin/com/stslex/wizard/core/ui/kit}/viewModel/ViewModelBean.ios.kt (97%) delete mode 100644 core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/subcompose/SubComposeType.kt delete mode 100644 core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingRequestType.kt delete mode 100644 core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/states/PagerLoadEvents.kt diff --git a/commonApp/build.gradle.kts b/commonApp/build.gradle.kts index 7f6d269..6d5180f 100644 --- a/commonApp/build.gradle.kts +++ b/commonApp/build.gradle.kts @@ -9,7 +9,7 @@ kotlin { implementation(project(":core:network:client")) implementation(project(":core:network:api")) implementation(project(":core:database")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:navigation")) implementation(project(":feature:film_feed")) diff --git a/commonApp/src/commonMain/kotlin/com/stslex/wizard/App.kt b/commonApp/src/commonMain/kotlin/com/stslex/wizard/App.kt index df45e5c..b09790f 100644 --- a/commonApp/src/commonMain/kotlin/com/stslex/wizard/App.kt +++ b/commonApp/src/commonMain/kotlin/com/stslex/wizard/App.kt @@ -2,7 +2,7 @@ package com.stslex.wizard import androidx.compose.runtime.Composable import com.stslex.wizard.config.KoinApp -import com.stslex.wizard.core.ui.theme.AppTheme +import com.stslex.wizard.core.ui.kit.theme.AppTheme import org.koin.core.KoinApplication @Composable diff --git a/commonApp/src/commonMain/kotlin/com/stslex/wizard/di/appModule.kt b/commonApp/src/commonMain/kotlin/com/stslex/wizard/di/appModule.kt index 1db76f1..90a9435 100644 --- a/commonApp/src/commonMain/kotlin/com/stslex/wizard/di/appModule.kt +++ b/commonApp/src/commonMain/kotlin/com/stslex/wizard/di/appModule.kt @@ -7,7 +7,7 @@ import com.stslex.wizard.core.database.di.ModuleCoreDatabase import com.stslex.wizard.core.navigation.di.ModuleCoreNavigation import com.stslex.wizard.core.network.api.di.ModuleCoreNetworkApi import com.stslex.wizard.core.network.client.di.ModuleCoreNetworkClient -import com.stslex.wizard.core.ui.di.ModuleCoreUi +import com.stslex.wizard.core.ui.kit.di.ModuleCoreUi import com.stslex.wizard.feature.auth.di.ModuleFeatureAuth import com.stslex.wizard.feature.favourite.di.ModuleFeatureFavourite import com.stslex.wizard.feature.film.di.ModuleFeatureFilm diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts index 4c51696..c65612b 100644 --- a/core/navigation/build.gradle.kts +++ b/core/navigation/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { sourceSets.commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) api(libs.compose.navigation) } diff --git a/core/ui/image/build.gradle.kts b/core/ui/image/build.gradle.kts new file mode 100644 index 0000000..f67d40a --- /dev/null +++ b/core/ui/image/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + alias(libs.plugins.convention.kmp.library.compose) +} + +kotlin { + sourceSets { + commonMain.dependencies { + implementation(project(":core:core")) + implementation(project(":core:network:client")) + implementation(libs.bundles.coil) + implementation(libs.bundles.ktor) + implementation(libs.slf4j.simple) + } + iosMain.dependencies { + api(libs.ktor.client.darwin) + } + androidMain.dependencies { + api(libs.ktor.client.android) + } + } +} \ No newline at end of file diff --git a/core/ui/build.gradle.kts b/core/ui/kit/build.gradle.kts similarity index 100% rename from core/ui/build.gradle.kts rename to core/ui/kit/build.gradle.kts diff --git a/core/ui/src/androidMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreExt.android.kt b/core/ui/kit/src/androidMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreExt.android.kt similarity index 91% rename from core/ui/src/androidMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreExt.android.kt rename to core/ui/kit/src/androidMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreExt.android.kt index 798572c..93f7f4e 100644 --- a/core/ui/src/androidMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreExt.android.kt +++ b/core/ui/kit/src/androidMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreExt.android.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.mvi +package com.stslex.wizard.core.ui.kit.mvi import androidx.lifecycle.ViewModel import org.koin.androidx.viewmodel.dsl.viewModel diff --git a/core/ui/src/androidMain/kotlin/com/stslex/wizard/core/ui/viewModel/ViewModelBean.android.kt b/core/ui/kit/src/androidMain/kotlin/com/stslex/wizard/core/ui/kit/viewModel/ViewModelBean.android.kt similarity index 97% rename from core/ui/src/androidMain/kotlin/com/stslex/wizard/core/ui/viewModel/ViewModelBean.android.kt rename to core/ui/kit/src/androidMain/kotlin/com/stslex/wizard/core/ui/kit/viewModel/ViewModelBean.android.kt index 281ce92..5b0b673 100644 --- a/core/ui/src/androidMain/kotlin/com/stslex/wizard/core/ui/viewModel/ViewModelBean.android.kt +++ b/core/ui/kit/src/androidMain/kotlin/com/stslex/wizard/core/ui/kit/viewModel/ViewModelBean.android.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.viewModel +package com.stslex.wizard.core.ui.kit.viewModel import androidx.lifecycle.ViewModel import org.koin.androidx.viewmodel.dsl.viewModelOf diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/Animations.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/Animations.kt similarity index 97% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/Animations.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/Animations.kt index d2012e8..2c39162 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/Animations.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/Animations.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base +package com.stslex.wizard.core.ui.kit.base import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.RepeatMode @@ -25,7 +25,7 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.stslex.wizard.core.ui.theme.toPx +import com.stslex.wizard.core.ui.kit.theme.toPx import kotlin.math.roundToInt fun Modifier.shimmerLoadingAnimation( diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/AppError.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/AppError.kt similarity index 93% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/AppError.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/AppError.kt index f74f37e..2016a1b 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/AppError.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/AppError.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base +package com.stslex.wizard.core.ui.kit.base import androidx.compose.runtime.Stable import com.stslex.wizard.core.core.error.ErrorRefresh diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/Clicker.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/Clicker.kt similarity index 96% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/Clicker.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/Clicker.kt index 9c7f9ba..89e66c8 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/Clicker.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/Clicker.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base +package com.stslex.wizard.core.ui.kit.base import androidx.compose.runtime.Composable import androidx.compose.runtime.remember diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/SwipeScrollConnection.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/SwipeScrollConnection.kt similarity index 97% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/SwipeScrollConnection.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/SwipeScrollConnection.kt index ff03b96..67ebdc2 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/SwipeScrollConnection.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/SwipeScrollConnection.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base +package com.stslex.wizard.core.ui.kit.base import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.SwipeableState diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/SwipeState.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/SwipeState.kt similarity index 54% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/SwipeState.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/SwipeState.kt index 0448ad4..672beb1 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/SwipeState.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/SwipeState.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base +package com.stslex.wizard.core.ui.kit.base enum class SwipeState { COLLAPSE, diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/image/AppImage.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/image/AppImage.kt similarity index 96% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/image/AppImage.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/image/AppImage.kt index cc79474..dba3022 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/image/AppImage.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/image/AppImage.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base.image +package com.stslex.wizard.core.ui.kit.base.image import androidx.compose.foundation.Image import androidx.compose.foundation.layout.BoxScope diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/image/ImageType.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/image/ImageType.kt similarity index 50% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/image/ImageType.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/image/ImageType.kt index 3c92754..c2e4882 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/image/ImageType.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/image/ImageType.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base.image +package com.stslex.wizard.core.ui.kit.base.image enum class ImageType { KAMEL, diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingColumn.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingColumn.kt similarity index 94% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingColumn.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingColumn.kt index 235df2f..d1c6f61 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingColumn.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingColumn.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base.paging +package com.stslex.wizard.core.ui.kit.base.paging import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -12,8 +12,8 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.ui.Modifier import com.stslex.wizard.core.core.paging.PagingCoreData.Companion.DEFAULT_APPEND_TYPE import com.stslex.wizard.core.core.paging.PagingCoreData.Companion.DEFAULT_BOTTOM_TYPE -import com.stslex.wizard.core.ui.base.DotsPrintAnimation -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.base.DotsPrintAnimation +import com.stslex.wizard.core.ui.kit.theme.AppDimension import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filterNotNull diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingConfig.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingConfig.kt similarity index 94% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingConfig.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingConfig.kt index 0e00747..34790ff 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingConfig.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingConfig.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base.paging +package com.stslex.wizard.core.ui.kit.base.paging import androidx.compose.runtime.Stable import com.stslex.wizard.core.core.paging.PagingCoreData diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingItem.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingItem.kt similarity index 86% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingItem.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingItem.kt index 95440cd..dabe4aa 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingItem.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingItem.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base.paging +package com.stslex.wizard.core.ui.kit.base.paging import androidx.compose.runtime.Stable import com.stslex.wizard.core.core.paging.PagingCoreData.Companion.DEFAULT_PAGING_TYPE diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingState.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingState.kt similarity index 96% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingState.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingState.kt index 5b92977..147ce76 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingState.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingState.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base.paging +package com.stslex.wizard.core.ui.kit.base.paging import androidx.compose.runtime.Stable import com.stslex.wizard.core.core.asyncMap diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingUiState.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingUiState.kt similarity index 94% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingUiState.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingUiState.kt index a9d671d..030a0a1 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/paging/PagingUiState.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/paging/PagingUiState.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base.paging +package com.stslex.wizard.core.ui.kit.base.paging import androidx.compose.runtime.Stable import kotlinx.collections.immutable.ImmutableList diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/subcompose/DimensionSubComposeLayout.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/subcompose/DimensionSubComposeLayout.kt similarity index 95% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/subcompose/DimensionSubComposeLayout.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/subcompose/DimensionSubComposeLayout.kt index a7fbf4c..4a28a06 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/subcompose/DimensionSubComposeLayout.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/subcompose/DimensionSubComposeLayout.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.base.subcompose +package com.stslex.wizard.core.ui.kit.base.subcompose import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/subcompose/SubComposeType.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/subcompose/SubComposeType.kt new file mode 100644 index 0000000..6325c02 --- /dev/null +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/base/subcompose/SubComposeType.kt @@ -0,0 +1,6 @@ +package com.stslex.wizard.core.ui.kit.base.subcompose + +enum class SubComposeType { + MAIN, + DEPEND +} \ No newline at end of file diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/AppSnackbar.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/AppSnackbar.kt similarity index 97% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/AppSnackbar.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/AppSnackbar.kt index 956fa38..0004dce 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/AppSnackbar.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/AppSnackbar.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.components +package com.stslex.wizard.core.ui.kit.components import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.layout.BoxScope @@ -27,8 +27,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.IntOffset -import com.stslex.wizard.core.ui.theme.AppDimension -import com.stslex.wizard.core.ui.theme.toPx +import com.stslex.wizard.core.ui.kit.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.toPx import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter import kotlin.math.roundToInt diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/AppToolbar.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/AppToolbar.kt similarity index 95% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/AppToolbar.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/AppToolbar.kt index e084868..64763df 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/AppToolbar.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/AppToolbar.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.components +package com.stslex.wizard.core.ui.kit.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -15,7 +15,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.AppDimension @Composable fun AppToolbar( diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/SnackbarSwipeState.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/SnackbarSwipeState.kt similarity index 60% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/SnackbarSwipeState.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/SnackbarSwipeState.kt index 7cc161f..eb71564 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/SnackbarSwipeState.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/SnackbarSwipeState.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.components +package com.stslex.wizard.core.ui.kit.components internal enum class SnackbarSwipeState { LEFT, diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/SnackbarType.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/SnackbarType.kt similarity index 95% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/SnackbarType.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/SnackbarType.kt index e23958d..f9771e8 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/components/SnackbarType.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/components/SnackbarType.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.components +package com.stslex.wizard.core.ui.kit.components import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Done diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/di/ModuleCoreUi.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/di/ModuleCoreUi.kt similarity index 57% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/di/ModuleCoreUi.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/di/ModuleCoreUi.kt index 6aea327..4db21cc 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/di/ModuleCoreUi.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/di/ModuleCoreUi.kt @@ -1,10 +1,10 @@ -package com.stslex.wizard.core.ui.di +package com.stslex.wizard.core.ui.kit.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.pager.pager.StorePagerFactory -import com.stslex.wizard.core.ui.pager.pager.StorePagerFactoryImpl -import com.stslex.wizard.core.ui.pager.paging_worker.PagingWorkerFactory -import com.stslex.wizard.core.ui.pager.paging_worker.PagingWorkerFactoryImpl +import com.stslex.wizard.core.ui.kit.pager.pager.StorePagerFactory +import com.stslex.wizard.core.ui.kit.pager.pager.StorePagerFactoryImpl +import com.stslex.wizard.core.ui.kit.pager.paging_worker.PagingWorkerFactory +import com.stslex.wizard.core.ui.kit.pager.paging_worker.PagingWorkerFactoryImpl import org.koin.core.annotation.Module import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.factoryOf diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/BaseStore.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/BaseStore.kt similarity index 95% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/BaseStore.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/BaseStore.kt index 5356db6..26d104b 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/BaseStore.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/BaseStore.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.mvi +package com.stslex.wizard.core.ui.kit.mvi import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -8,9 +8,9 @@ import com.stslex.wizard.core.core.Logger import com.stslex.wizard.core.core.coroutine.AppCoroutineScope import com.stslex.wizard.core.core.coroutine.AppCoroutineScopeImpl import com.stslex.wizard.core.core.coroutineExceptionHandler -import com.stslex.wizard.core.ui.mvi.Store.Action -import com.stslex.wizard.core.ui.mvi.Store.Event -import com.stslex.wizard.core.ui.mvi.Store.State +import com.stslex.wizard.core.ui.kit.mvi.Store.Action +import com.stslex.wizard.core.ui.kit.mvi.Store.Event +import com.stslex.wizard.core.ui.kit.mvi.Store.State import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/CommonEvents.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/CommonEvents.kt similarity index 93% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/CommonEvents.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/CommonEvents.kt index 2be89c4..db341a1 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/CommonEvents.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/CommonEvents.kt @@ -1,8 +1,8 @@ -package com.stslex.wizard.core.ui.mvi +package com.stslex.wizard.core.ui.kit.mvi import androidx.compose.material3.SnackbarDuration import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.components.SnackbarType +import com.stslex.wizard.core.ui.kit.components.SnackbarType interface CommonEvents { diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/Router.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/Router.kt similarity index 68% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/Router.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/Router.kt index 0b735c3..fc36422 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/Router.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/Router.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.mvi +package com.stslex.wizard.core.ui.kit.mvi fun interface Router { operator fun invoke(event: E) diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/Store.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/Store.kt similarity index 79% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/Store.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/Store.kt index 1496c78..6f1815c 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/Store.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/Store.kt @@ -1,8 +1,8 @@ -package com.stslex.wizard.core.ui.mvi +package com.stslex.wizard.core.ui.kit.mvi -import com.stslex.wizard.core.ui.mvi.Store.Action -import com.stslex.wizard.core.ui.mvi.Store.Event -import com.stslex.wizard.core.ui.mvi.Store.State +import com.stslex.wizard.core.ui.kit.mvi.Store.Action +import com.stslex.wizard.core.ui.kit.mvi.Store.Event +import com.stslex.wizard.core.ui.kit.mvi.Store.State import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreBean.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreBean.kt similarity index 94% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreBean.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreBean.kt index a0dd897..68b7a4e 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreBean.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreBean.kt @@ -1,6 +1,6 @@ -package com.stslex.wizard.core.ui.mvi +package com.stslex.wizard.core.ui.kit.mvi -import com.stslex.wizard.core.ui.viewModel.viewModelOf +import com.stslex.wizard.core.ui.kit.viewModel.viewModelOf import org.koin.core.definition.BeanDefinition import org.koin.core.definition.KoinDefinition import org.koin.core.module.Module diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreExt.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreExt.kt similarity index 94% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreExt.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreExt.kt index d568358..84c136c 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreExt.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreExt.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.mvi +package com.stslex.wizard.core.ui.kit.mvi import androidx.compose.runtime.Composable import androidx.lifecycle.ViewModel diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/mapper/PagingMapper.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/mapper/PagingMapper.kt similarity index 60% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/mapper/PagingMapper.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/mapper/PagingMapper.kt index 85b4724..aececf6 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/mapper/PagingMapper.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/mapper/PagingMapper.kt @@ -1,7 +1,7 @@ -package com.stslex.wizard.core.ui.pager.mapper +package com.stslex.wizard.core.ui.kit.pager.mapper import com.stslex.wizard.core.core.paging.PagingCoreItem -import com.stslex.wizard.core.ui.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem fun interface PagingMapper { diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePager.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePager.kt similarity index 54% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePager.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePager.kt index 5871121..ec3f0cd 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePager.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePager.kt @@ -1,9 +1,9 @@ -package com.stslex.wizard.core.ui.pager.pager +package com.stslex.wizard.core.ui.kit.pager.pager -import com.stslex.wizard.core.ui.base.paging.PagingItem -import com.stslex.wizard.core.ui.base.paging.PagingState -import com.stslex.wizard.core.ui.pager.states.PagerLoadEvents -import com.stslex.wizard.core.ui.pager.states.PagerLoadState +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.base.paging.PagingState +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadEvents +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadState import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePagerFactory.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePagerFactory.kt similarity index 66% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePagerFactory.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePagerFactory.kt index 88c432b..110c2c3 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePagerFactory.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePagerFactory.kt @@ -1,11 +1,11 @@ -package com.stslex.wizard.core.ui.pager.pager +package com.stslex.wizard.core.ui.kit.pager.pager import com.stslex.wizard.core.core.coroutine.AppCoroutineScope import com.stslex.wizard.core.core.paging.PagingCoreItem import com.stslex.wizard.core.core.paging.PagingResponse -import com.stslex.wizard.core.ui.base.paging.PagingConfig -import com.stslex.wizard.core.ui.base.paging.PagingItem -import com.stslex.wizard.core.ui.pager.mapper.PagingMapper +import com.stslex.wizard.core.ui.kit.base.paging.PagingConfig +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.pager.mapper.PagingMapper interface StorePagerFactory { diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePagerFactoryImpl.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePagerFactoryImpl.kt similarity index 74% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePagerFactoryImpl.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePagerFactoryImpl.kt index abcc4af..4a54cf4 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePagerFactoryImpl.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePagerFactoryImpl.kt @@ -1,12 +1,12 @@ -package com.stslex.wizard.core.ui.pager.pager +package com.stslex.wizard.core.ui.kit.pager.pager import com.stslex.wizard.core.core.coroutine.AppCoroutineScope import com.stslex.wizard.core.core.paging.PagingCoreItem import com.stslex.wizard.core.core.paging.PagingResponse -import com.stslex.wizard.core.ui.base.paging.PagingConfig -import com.stslex.wizard.core.ui.base.paging.PagingItem -import com.stslex.wizard.core.ui.pager.mapper.PagingMapper -import com.stslex.wizard.core.ui.pager.paging_worker.PagingWorkerFactory +import com.stslex.wizard.core.ui.kit.base.paging.PagingConfig +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.pager.mapper.PagingMapper +import com.stslex.wizard.core.ui.kit.pager.paging_worker.PagingWorkerFactory class StorePagerFactoryImpl( private val workerFactory: PagingWorkerFactory diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePagerImpl.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePagerImpl.kt similarity index 86% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePagerImpl.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePagerImpl.kt index 4426b1b..2a99553 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/pager/StorePagerImpl.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/pager/StorePagerImpl.kt @@ -1,18 +1,18 @@ -package com.stslex.wizard.core.ui.pager.pager +package com.stslex.wizard.core.ui.kit.pager.pager import com.stslex.wizard.core.core.paging.PagingCoreData.Companion.DEFAULT_PAGE import com.stslex.wizard.core.core.paging.PagingCoreItem import com.stslex.wizard.core.core.paging.PagingResponse -import com.stslex.wizard.core.ui.base.mapToAppError -import com.stslex.wizard.core.ui.base.paging.PagingConfig -import com.stslex.wizard.core.ui.base.paging.PagingItem -import com.stslex.wizard.core.ui.base.paging.PagingState -import com.stslex.wizard.core.ui.base.paging.pagingMap -import com.stslex.wizard.core.ui.pager.states.PagerLoadEvents -import com.stslex.wizard.core.ui.pager.states.PagerLoadState -import com.stslex.wizard.core.ui.pager.mapper.PagingMapper -import com.stslex.wizard.core.ui.pager.paging_worker.PagingRequestType -import com.stslex.wizard.core.ui.pager.paging_worker.PagingWorker +import com.stslex.wizard.core.ui.kit.base.mapToAppError +import com.stslex.wizard.core.ui.kit.base.paging.PagingConfig +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.base.paging.PagingState +import com.stslex.wizard.core.ui.kit.base.paging.pagingMap +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadEvents +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadState +import com.stslex.wizard.core.ui.kit.pager.mapper.PagingMapper +import com.stslex.wizard.core.ui.kit.pager.paging_worker.PagingRequestType +import com.stslex.wizard.core.ui.kit.pager.paging_worker.PagingWorker import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.Job import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingRequestType.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingRequestType.kt new file mode 100644 index 0000000..a47a32c --- /dev/null +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingRequestType.kt @@ -0,0 +1,6 @@ +package com.stslex.wizard.core.ui.kit.pager.paging_worker + +enum class PagingRequestType { + DEFAULT, + QUERY +} \ No newline at end of file diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorker.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorker.kt similarity index 90% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorker.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorker.kt index 1b1d2ca..6efba68 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorker.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorker.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.pager.paging_worker +package com.stslex.wizard.core.ui.kit.pager.paging_worker import com.stslex.wizard.core.core.paging.PagingCoreItem import com.stslex.wizard.core.core.paging.PagingResponse diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorkerFactory.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorkerFactory.kt similarity index 66% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorkerFactory.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorkerFactory.kt index d1e75ec..5923923 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorkerFactory.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorkerFactory.kt @@ -1,6 +1,7 @@ -package com.stslex.wizard.core.ui.pager.paging_worker +package com.stslex.wizard.core.ui.kit.pager.paging_worker import com.stslex.wizard.core.core.coroutine.AppCoroutineScope +import com.stslex.wizard.core.ui.kit.pager.paging_worker.PagingWorker interface PagingWorkerFactory { diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorkerFactoryImpl.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorkerFactoryImpl.kt similarity index 88% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorkerFactoryImpl.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorkerFactoryImpl.kt index 098d05a..854b040 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorkerFactoryImpl.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorkerFactoryImpl.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.pager.paging_worker +package com.stslex.wizard.core.ui.kit.pager.paging_worker import com.stslex.wizard.core.core.coroutine.AppCoroutineScope diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorkerImpl.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorkerImpl.kt similarity index 98% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorkerImpl.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorkerImpl.kt index 6e5c480..a6735e5 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingWorkerImpl.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/paging_worker/PagingWorkerImpl.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.pager.paging_worker +package com.stslex.wizard.core.ui.kit.pager.paging_worker import com.stslex.wizard.core.core.coroutine.AppCoroutineScope import com.stslex.wizard.core.core.paging.PagingCoreItem diff --git a/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/states/PagerLoadEvents.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/states/PagerLoadEvents.kt new file mode 100644 index 0000000..d095a64 --- /dev/null +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/states/PagerLoadEvents.kt @@ -0,0 +1,8 @@ +package com.stslex.wizard.core.ui.kit.pager.states + +import com.stslex.wizard.core.ui.kit.base.AppError + +sealed interface PagerLoadEvents { + + data class Error(val error: AppError) : PagerLoadEvents +} \ No newline at end of file diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/states/PagerLoadState.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/states/PagerLoadState.kt similarity index 77% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/states/PagerLoadState.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/states/PagerLoadState.kt index e54b418..e63bb56 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/states/PagerLoadState.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/pager/states/PagerLoadState.kt @@ -1,6 +1,6 @@ -package com.stslex.wizard.core.ui.pager.states +package com.stslex.wizard.core.ui.kit.pager.states -import com.stslex.wizard.core.ui.base.AppError +import com.stslex.wizard.core.ui.kit.base.AppError sealed interface PagerLoadState { diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/theme/AppDimension.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/theme/AppDimension.kt similarity index 92% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/theme/AppDimension.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/theme/AppDimension.kt index 3f6bd9c..1df38f8 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/theme/AppDimension.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/theme/AppDimension.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.theme +package com.stslex.wizard.core.ui.kit.theme import androidx.compose.ui.unit.dp diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/theme/AppTheme.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/theme/AppTheme.kt similarity index 94% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/theme/AppTheme.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/theme/AppTheme.kt index d2a679d..41fcbc8 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/theme/AppTheme.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/theme/AppTheme.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.theme +package com.stslex.wizard.core.ui.kit.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/theme/DimenExt.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/theme/DimenExt.kt similarity index 93% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/theme/DimenExt.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/theme/DimenExt.kt index a6db08f..513c27c 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/theme/DimenExt.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/theme/DimenExt.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.theme +package com.stslex.wizard.core.ui.kit.theme import androidx.compose.runtime.Composable import androidx.compose.runtime.ReadOnlyComposable diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/viewModel/ViewModelBean.kt b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/viewModel/ViewModelBean.kt similarity index 96% rename from core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/viewModel/ViewModelBean.kt rename to core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/viewModel/ViewModelBean.kt index 26cd092..6212637 100644 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/viewModel/ViewModelBean.kt +++ b/core/ui/kit/src/commonMain/kotlin/com/stslex/wizard/core/ui/kit/viewModel/ViewModelBean.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.viewModel +package com.stslex.wizard.core.ui.kit.viewModel import androidx.lifecycle.ViewModel import org.koin.core.definition.BeanDefinition diff --git a/core/ui/src/iosMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreExt.ios.kt b/core/ui/kit/src/iosMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreExt.ios.kt similarity index 91% rename from core/ui/src/iosMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreExt.ios.kt rename to core/ui/kit/src/iosMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreExt.ios.kt index 7ec579b..9202688 100644 --- a/core/ui/src/iosMain/kotlin/com/stslex/wizard/core/ui/mvi/StoreExt.ios.kt +++ b/core/ui/kit/src/iosMain/kotlin/com/stslex/wizard/core/ui/kit/mvi/StoreExt.ios.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.mvi +package com.stslex.wizard.core.ui.kit.mvi import androidx.lifecycle.ViewModel import org.koin.core.definition.Definition diff --git a/core/ui/src/iosMain/kotlin/com/stslex/wizard/core/ui/viewModel/ViewModelBean.ios.kt b/core/ui/kit/src/iosMain/kotlin/com/stslex/wizard/core/ui/kit/viewModel/ViewModelBean.ios.kt similarity index 97% rename from core/ui/src/iosMain/kotlin/com/stslex/wizard/core/ui/viewModel/ViewModelBean.ios.kt rename to core/ui/kit/src/iosMain/kotlin/com/stslex/wizard/core/ui/kit/viewModel/ViewModelBean.ios.kt index c6cff7b..4bd564c 100644 --- a/core/ui/src/iosMain/kotlin/com/stslex/wizard/core/ui/viewModel/ViewModelBean.ios.kt +++ b/core/ui/kit/src/iosMain/kotlin/com/stslex/wizard/core/ui/kit/viewModel/ViewModelBean.ios.kt @@ -1,4 +1,4 @@ -package com.stslex.wizard.core.ui.viewModel +package com.stslex.wizard.core.ui.kit.viewModel import androidx.lifecycle.ViewModel import org.koin.core.definition.BeanDefinition diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/subcompose/SubComposeType.kt b/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/subcompose/SubComposeType.kt deleted file mode 100644 index bff560d..0000000 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/base/subcompose/SubComposeType.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.stslex.wizard.core.ui.base.subcompose - -enum class SubComposeType { - MAIN, - DEPEND -} \ No newline at end of file diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingRequestType.kt b/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingRequestType.kt deleted file mode 100644 index 0532012..0000000 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/paging_worker/PagingRequestType.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.stslex.wizard.core.ui.pager.paging_worker - -enum class PagingRequestType { - DEFAULT, - QUERY -} \ No newline at end of file diff --git a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/states/PagerLoadEvents.kt b/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/states/PagerLoadEvents.kt deleted file mode 100644 index 23f9bbc..0000000 --- a/core/ui/src/commonMain/kotlin/com/stslex/wizard/core/ui/pager/states/PagerLoadEvents.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.stslex.wizard.core.ui.pager.states - -import com.stslex.wizard.core.ui.base.AppError - -sealed interface PagerLoadEvents { - - data class Error(val error: AppError) : PagerLoadEvents -} \ No newline at end of file diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts index 3a9c149..1fe2d80 100644 --- a/feature/auth/build.gradle.kts +++ b/feature/auth/build.gradle.kts @@ -6,7 +6,7 @@ kotlin { sourceSets { commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:navigation")) implementation(project(":core:network:api")) implementation(project(":core:database")) diff --git a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/di/ModuleFeatureAuth.kt b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/di/ModuleFeatureAuth.kt index c84a3e8..dd00146 100644 --- a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/di/ModuleFeatureAuth.kt +++ b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/di/ModuleFeatureAuth.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.auth.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.mvi.storeOf +import com.stslex.wizard.core.ui.kit.mvi.storeOf import com.stslex.wizard.feature.auth.data.AuthRepository import com.stslex.wizard.feature.auth.data.AuthRepositoryImpl import com.stslex.wizard.feature.auth.domain.AuthInteractor diff --git a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/navigation/AuthGraph.kt b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/navigation/AuthGraph.kt index 9eaa870..eeaf93f 100644 --- a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/navigation/AuthGraph.kt +++ b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/navigation/AuthGraph.kt @@ -8,7 +8,7 @@ import androidx.compose.runtime.remember import androidx.navigation.NavGraphBuilder import com.stslex.wizard.core.navigation.Screen import com.stslex.wizard.core.navigation.navScreen -import com.stslex.wizard.core.ui.mvi.getStore +import com.stslex.wizard.core.ui.kit.mvi.getStore import com.stslex.wizard.feature.auth.ui.AuthScreen import com.stslex.wizard.feature.auth.ui.model.screen.rememberAuthScreenState import com.stslex.wizard.feature.auth.ui.store.AuthStore diff --git a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/navigation/AuthRouter.kt b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/navigation/AuthRouter.kt index db1d673..850ae95 100644 --- a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/navigation/AuthRouter.kt +++ b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/navigation/AuthRouter.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.auth.navigation -import com.stslex.wizard.core.ui.mvi.Router +import com.stslex.wizard.core.ui.kit.mvi.Router import com.stslex.wizard.feature.auth.ui.store.AuthStore interface AuthRouter : Router \ No newline at end of file diff --git a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/AuthScreen.kt b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/AuthScreen.kt index b556f3a..669b49e 100644 --- a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/AuthScreen.kt +++ b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/AuthScreen.kt @@ -14,9 +14,9 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.components.AppSnackbarHost -import com.stslex.wizard.core.ui.theme.AppDimension -import com.stslex.wizard.core.ui.theme.toPx +import com.stslex.wizard.core.ui.kit.components.AppSnackbarHost +import com.stslex.wizard.core.ui.kit.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.toPx import com.stslex.wizard.feature.auth.ui.components.AuthFieldsColumn import com.stslex.wizard.feature.auth.ui.components.AuthTitle import com.stslex.wizard.feature.auth.ui.model.screen.AuthScreenState diff --git a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/components/AuthFieldsColumn.kt b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/components/AuthFieldsColumn.kt index d53011c..941cebf 100644 --- a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/components/AuthFieldsColumn.kt +++ b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/components/AuthFieldsColumn.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.auth.ui.model.screen.AuthScreenState import com.stslex.wizard.feature.auth.ui.model.screen.text_field.LoginTextFieldState import com.stslex.wizard.feature.auth.ui.model.screen.text_field.UsernameTextFieldState diff --git a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/components/AuthTitle.kt b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/components/AuthTitle.kt index ec6cef9..b8c3b2f 100644 --- a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/components/AuthTitle.kt +++ b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/components/AuthTitle.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.scale import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.auth.ui.store.AuthStore.AuthFieldsState import kotlinx.coroutines.launch diff --git a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/store/AuthStore.kt b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/store/AuthStore.kt index 74c8a1b..60f191e 100644 --- a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/store/AuthStore.kt +++ b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/store/AuthStore.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.auth.ui.store -import com.stslex.wizard.core.ui.mvi.CommonEvents -import com.stslex.wizard.core.ui.mvi.Store +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents +import com.stslex.wizard.core.ui.kit.mvi.Store import com.stslex.wizard.feature.auth.ui.store.AuthStore.Action import com.stslex.wizard.feature.auth.ui.store.AuthStore.Event import com.stslex.wizard.feature.auth.ui.store.AuthStore.State diff --git a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/store/AuthStoreImpl.kt b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/store/AuthStoreImpl.kt index 62063d3..dabd498 100644 --- a/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/store/AuthStoreImpl.kt +++ b/feature/auth/src/commonMain/kotlin/com/stslex/wizard/feature/auth/ui/store/AuthStoreImpl.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.auth.ui.store -import com.stslex.wizard.core.ui.mvi.BaseStore -import com.stslex.wizard.core.ui.mvi.CommonEvents.Snackbar +import com.stslex.wizard.core.ui.kit.mvi.BaseStore +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents.Snackbar import com.stslex.wizard.feature.auth.domain.AuthInteractor import com.stslex.wizard.feature.auth.navigation.AuthRouter import com.stslex.wizard.feature.auth.ui.store.AuthStore.Action diff --git a/feature/favourite/build.gradle.kts b/feature/favourite/build.gradle.kts index 9eaf337..42dfd8b 100644 --- a/feature/favourite/build.gradle.kts +++ b/feature/favourite/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { sourceSets.commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:network:api")) implementation(project(":core:navigation")) } diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/di/ModuleFeatureFavourite.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/di/ModuleFeatureFavourite.kt index e3189d1..7d86b9e 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/di/ModuleFeatureFavourite.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/di/ModuleFeatureFavourite.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.favourite.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.mvi.storeOf +import com.stslex.wizard.core.ui.kit.mvi.storeOf import com.stslex.wizard.feature.favourite.data.repository.FavouriteRepository import com.stslex.wizard.feature.favourite.data.repository.FavouriteRepositoryImpl import com.stslex.wizard.feature.favourite.domain.interactor.FavouriteInteractor diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/navigation/FavouriteGraph.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/navigation/FavouriteGraph.kt index 7289879..11df185 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/navigation/FavouriteGraph.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/navigation/FavouriteGraph.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.remember import androidx.navigation.NavGraphBuilder import com.stslex.wizard.core.navigation.Screen import com.stslex.wizard.core.navigation.navScreen -import com.stslex.wizard.core.ui.mvi.getStore +import com.stslex.wizard.core.ui.kit.mvi.getStore import com.stslex.wizard.feature.favourite.ui.FavouriteScreen import com.stslex.wizard.feature.favourite.ui.store.FavouriteStore import com.stslex.wizard.feature.favourite.ui.store.FavouriteStore.Action diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/navigation/FavouriteRouter.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/navigation/FavouriteRouter.kt index 812022b..217ff12 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/navigation/FavouriteRouter.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/navigation/FavouriteRouter.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.favourite.navigation -import com.stslex.wizard.core.ui.mvi.Router +import com.stslex.wizard.core.ui.kit.mvi.Router import com.stslex.wizard.feature.favourite.ui.store.FavouriteStore interface FavouriteRouter : Router diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContent.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContent.kt index 873dc1e..9479699 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContent.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContent.kt @@ -9,9 +9,9 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.base.paging.PagingColumn -import com.stslex.wizard.core.ui.base.paging.PagingUiState -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.base.paging.PagingColumn +import com.stslex.wizard.core.ui.kit.base.paging.PagingUiState +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.favourite.ui.components.empty.FavouriteScreenEmpty import com.stslex.wizard.feature.favourite.ui.components.shimmer.FavouriteScreenShimmer import com.stslex.wizard.feature.favourite.ui.model.FavouriteModel diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContentItem.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContentItem.kt index 326e19a..672dff7 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContentItem.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContentItem.kt @@ -14,7 +14,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.favourite.ui.model.FavouriteModel @Composable diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContentLoading.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContentLoading.kt index 92a053e..4ee1aba 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContentLoading.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenContentLoading.kt @@ -2,7 +2,7 @@ package com.stslex.wizard.feature.favourite.ui.components.content import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.base.DotsPrintAnimation +import com.stslex.wizard.core.ui.kit.base.DotsPrintAnimation @Composable fun FavouriteScreenContentLoading( diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenSearchField.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenSearchField.kt index d3475e7..432b862 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenSearchField.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/content/FavouriteScreenSearchField.kt @@ -6,7 +6,7 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.AppDimension @Composable diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/shimmer/FavouriteScreenShimmer.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/shimmer/FavouriteScreenShimmer.kt index 232df10..8fe4cb4 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/shimmer/FavouriteScreenShimmer.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/components/shimmer/FavouriteScreenShimmer.kt @@ -14,8 +14,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp -import com.stslex.wizard.core.ui.base.shimmerLoadingAnimation -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.base.shimmerLoadingAnimation +import com.stslex.wizard.core.ui.kit.theme.AppDimension @Composable fun FavouriteScreenShimmer( diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/model/FavouriteModel.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/model/FavouriteModel.kt index ba4d003..10d85b5 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/model/FavouriteModel.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/model/FavouriteModel.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.favourite.ui.model import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem @Stable data class FavouriteModel( diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteScreenState.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteScreenState.kt index 0dd3cee..04491e6 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteScreenState.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteScreenState.kt @@ -1,8 +1,8 @@ package com.stslex.wizard.feature.favourite.ui.store import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.base.AppError -import com.stslex.wizard.core.ui.pager.states.PagerLoadState +import com.stslex.wizard.core.ui.kit.base.AppError +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadState @Stable sealed interface FavouriteScreenState { diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteStore.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteStore.kt index 3d75f05..c6637f7 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteStore.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteStore.kt @@ -1,10 +1,10 @@ package com.stslex.wizard.feature.favourite.ui.store import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.base.paging.PagingConfig -import com.stslex.wizard.core.ui.base.paging.PagingUiState -import com.stslex.wizard.core.ui.mvi.CommonEvents -import com.stslex.wizard.core.ui.mvi.Store +import com.stslex.wizard.core.ui.kit.base.paging.PagingConfig +import com.stslex.wizard.core.ui.kit.base.paging.PagingUiState +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents +import com.stslex.wizard.core.ui.kit.mvi.Store import com.stslex.wizard.feature.favourite.ui.model.FavouriteModel import com.stslex.wizard.feature.favourite.ui.store.FavouriteStore.Action import com.stslex.wizard.feature.favourite.ui.store.FavouriteStore.Event diff --git a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteStoreImpl.kt b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteStoreImpl.kt index 2dd2825..b68a6ea 100644 --- a/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteStoreImpl.kt +++ b/feature/favourite/src/commonMain/kotlin/com/stslex/wizard/feature/favourite/ui/store/FavouriteStoreImpl.kt @@ -1,13 +1,13 @@ package com.stslex.wizard.feature.favourite.ui.store import com.stslex.wizard.core.core.AppDispatcher -import com.stslex.wizard.core.ui.base.mapToAppError -import com.stslex.wizard.core.ui.base.paging.toUi -import com.stslex.wizard.core.ui.mvi.BaseStore -import com.stslex.wizard.core.ui.mvi.CommonEvents.Snackbar -import com.stslex.wizard.core.ui.pager.pager.StorePager -import com.stslex.wizard.core.ui.pager.pager.StorePagerFactory -import com.stslex.wizard.core.ui.pager.states.PagerLoadState +import com.stslex.wizard.core.ui.kit.base.mapToAppError +import com.stslex.wizard.core.ui.kit.base.paging.toUi +import com.stslex.wizard.core.ui.kit.mvi.BaseStore +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents.Snackbar +import com.stslex.wizard.core.ui.kit.pager.pager.StorePager +import com.stslex.wizard.core.ui.kit.pager.pager.StorePagerFactory +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadState import com.stslex.wizard.feature.favourite.domain.interactor.FavouriteInteractor import com.stslex.wizard.feature.favourite.navigation.FavouriteRouter import com.stslex.wizard.feature.favourite.ui.model.FavouriteModel diff --git a/feature/film/build.gradle.kts b/feature/film/build.gradle.kts index 04155c5..0a303d2 100644 --- a/feature/film/build.gradle.kts +++ b/feature/film/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { sourceSets.commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:network:api")) implementation(project(":core:database")) implementation(project(":core:navigation")) diff --git a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/di/ModuleFeatureFilm.kt b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/di/ModuleFeatureFilm.kt index c83d316..3691820 100644 --- a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/di/ModuleFeatureFilm.kt +++ b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/di/ModuleFeatureFilm.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.film.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.mvi.storeOf +import com.stslex.wizard.core.ui.kit.mvi.storeOf import com.stslex.wizard.feature.film.data.repository.FilmRepository import com.stslex.wizard.feature.film.data.repository.FilmRepositoryImpl import com.stslex.wizard.feature.film.domain.interactor.FilmInteractor diff --git a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/navigation/FilmRouter.kt b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/navigation/FilmRouter.kt index 9ab014c..0b68cc6 100644 --- a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/navigation/FilmRouter.kt +++ b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/navigation/FilmRouter.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.film.navigation -import com.stslex.wizard.core.ui.mvi.Router +import com.stslex.wizard.core.ui.kit.mvi.Router import com.stslex.wizard.feature.film.ui.store.FilmStore interface FilmRouter : Router diff --git a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/navigation/GraphFilm.kt b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/navigation/GraphFilm.kt index 1a775d4..d55e967 100644 --- a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/navigation/GraphFilm.kt +++ b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/navigation/GraphFilm.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.remember import androidx.navigation.NavGraphBuilder import com.stslex.wizard.core.navigation.Screen import com.stslex.wizard.core.navigation.navScreen -import com.stslex.wizard.core.ui.mvi.getStore +import com.stslex.wizard.core.ui.kit.mvi.getStore import com.stslex.wizard.feature.film.ui.FilmScreen import com.stslex.wizard.feature.film.ui.store.FilmStore import com.stslex.wizard.feature.film.ui.store.FilmStore.Action diff --git a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/components/FilmContentScreen.kt b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/components/FilmContentScreen.kt index e7a79c7..b23be5f 100644 --- a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/components/FilmContentScreen.kt +++ b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/components/FilmContentScreen.kt @@ -51,14 +51,14 @@ import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.text.style.TextOverflow 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.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 -import com.stslex.wizard.core.ui.theme.toDp -import com.stslex.wizard.core.ui.theme.toPx +import com.stslex.wizard.core.ui.kit.base.SwipeScrollConnection +import com.stslex.wizard.core.ui.kit.base.SwipeState +import com.stslex.wizard.core.ui.kit.base.image.AppImage +import com.stslex.wizard.core.ui.kit.base.onClick +import com.stslex.wizard.core.ui.kit.base.onClickDelay +import com.stslex.wizard.core.ui.kit.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.toDp +import com.stslex.wizard.core.ui.kit.theme.toPx import com.stslex.wizard.feature.film.ui.model.Film @OptIn(ExperimentalMaterialApi::class) diff --git a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/store/FilmStore.kt b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/store/FilmStore.kt index 57acd17..0820303 100644 --- a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/store/FilmStore.kt +++ b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/store/FilmStore.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.film.ui.store import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.mvi.Store +import com.stslex.wizard.core.ui.kit.mvi.Store import com.stslex.wizard.feature.film.ui.store.FilmStore.Action import com.stslex.wizard.feature.film.ui.store.FilmStore.Event import com.stslex.wizard.feature.film.ui.store.FilmStore.State diff --git a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/store/FilmStoreImpl.kt b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/store/FilmStoreImpl.kt index 6ede5b3..1db0dab 100644 --- a/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/store/FilmStoreImpl.kt +++ b/feature/film/src/commonMain/kotlin/com/stslex/wizard/feature/film/ui/store/FilmStoreImpl.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.film.ui.store -import com.stslex.wizard.core.ui.mvi.BaseStore +import com.stslex.wizard.core.ui.kit.mvi.BaseStore import com.stslex.wizard.feature.film.domain.interactor.FilmInteractor import com.stslex.wizard.feature.film.navigation.FilmRouter import com.stslex.wizard.feature.film.ui.model.toDomain diff --git a/feature/film_feed/build.gradle.kts b/feature/film_feed/build.gradle.kts index 2f6f4d8..2d71544 100644 --- a/feature/film_feed/build.gradle.kts +++ b/feature/film_feed/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { sourceSets.commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:network:api")) implementation(project(":core:navigation")) } diff --git a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/di/ModuleFeatureFeed.kt b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/di/ModuleFeatureFeed.kt index 7985237..cc6d207 100644 --- a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/di/ModuleFeatureFeed.kt +++ b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/di/ModuleFeatureFeed.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.film_feed.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.mvi.storeOf +import com.stslex.wizard.core.ui.kit.mvi.storeOf import com.stslex.wizard.feature.film_feed.data.repository.FeedRepository import com.stslex.wizard.feature.film_feed.data.repository.FeedRepositoryImpl import com.stslex.wizard.feature.film_feed.domain.interactor.FeedInteractor diff --git a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/navigation/FeedScreenRouter.kt b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/navigation/FeedScreenRouter.kt index b0c42f1..ba86ba5 100644 --- a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/navigation/FeedScreenRouter.kt +++ b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/navigation/FeedScreenRouter.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.film_feed.navigation -import com.stslex.wizard.core.ui.mvi.Router +import com.stslex.wizard.core.ui.kit.mvi.Router import com.stslex.wizard.feature.film_feed.ui.store.FeedStore.Action.Navigation interface FeedScreenRouter : Router diff --git a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/navigation/GraphFilmFeed.kt b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/navigation/GraphFilmFeed.kt index 78a3f42..aca2047 100644 --- a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/navigation/GraphFilmFeed.kt +++ b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/navigation/GraphFilmFeed.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.remember import androidx.navigation.NavGraphBuilder import com.stslex.wizard.core.navigation.Screen import com.stslex.wizard.core.navigation.navScreen -import com.stslex.wizard.core.ui.mvi.getStore +import com.stslex.wizard.core.ui.kit.mvi.getStore import com.stslex.wizard.feature.film_feed.ui.FeedScreen import com.stslex.wizard.feature.film_feed.ui.store.FeedStore import com.stslex.wizard.feature.film_feed.ui.store.FeedStore.Action diff --git a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/components/FeedScreenFilmItem.kt b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/components/FeedScreenFilmItem.kt index 32dca61..f00d72f 100644 --- a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/components/FeedScreenFilmItem.kt +++ b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/components/FeedScreenFilmItem.kt @@ -23,9 +23,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.Dp -import com.stslex.wizard.core.ui.base.image.AppImage -import com.stslex.wizard.core.ui.base.onClickDelay -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.base.image.AppImage +import com.stslex.wizard.core.ui.kit.base.onClickDelay +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.film_feed.ui.model.FilmModel import kotlinx.collections.immutable.ImmutableList diff --git a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/store/FeedStore.kt b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/store/FeedStore.kt index 1c1c975..a7bfdad 100644 --- a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/store/FeedStore.kt +++ b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/store/FeedStore.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.film_feed.ui.store import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.mvi.Store +import com.stslex.wizard.core.ui.kit.mvi.Store import com.stslex.wizard.feature.film_feed.ui.model.FilmModel import com.stslex.wizard.feature.film_feed.ui.model.ScreenState import com.stslex.wizard.feature.film_feed.ui.store.FeedStore.Action diff --git a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/store/FeedStoreImpl.kt b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/store/FeedStoreImpl.kt index 44f210b..51ec3c1 100644 --- a/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/store/FeedStoreImpl.kt +++ b/feature/film_feed/src/commonMain/kotlin/com/stslex/wizard/feature/film_feed/ui/store/FeedStoreImpl.kt @@ -2,7 +2,7 @@ package com.stslex.wizard.feature.film_feed.ui.store import androidx.compose.runtime.Stable import com.stslex.wizard.core.core.Logger -import com.stslex.wizard.core.ui.mvi.BaseStore +import com.stslex.wizard.core.ui.kit.mvi.BaseStore import com.stslex.wizard.feature.film_feed.domain.interactor.FeedInteractor import com.stslex.wizard.feature.film_feed.navigation.FeedScreenRouter import com.stslex.wizard.feature.film_feed.ui.model.ScreenState diff --git a/feature/follower/build.gradle.kts b/feature/follower/build.gradle.kts index 559fc04..f068ae9 100644 --- a/feature/follower/build.gradle.kts +++ b/feature/follower/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { sourceSets.commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:network:api")) implementation(project(":core:navigation")) } diff --git a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/di/ModuleFeatureFollower.kt b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/di/ModuleFeatureFollower.kt index b4f72dc..e92e9e7 100644 --- a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/di/ModuleFeatureFollower.kt +++ b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/di/ModuleFeatureFollower.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.follower.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.mvi.storeOf +import com.stslex.wizard.core.ui.kit.mvi.storeOf import com.stslex.wizard.feature.follower.data.repository.FollowerRepository import com.stslex.wizard.feature.follower.data.repository.FollowerRepositoryImpl import com.stslex.wizard.feature.follower.domain.interactor.FollowerInteractor diff --git a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/navigation/FollowerRouter.kt b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/navigation/FollowerRouter.kt index 1db8523..61b8454 100644 --- a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/navigation/FollowerRouter.kt +++ b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/navigation/FollowerRouter.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.follower.navigation -import com.stslex.wizard.core.ui.mvi.Router +import com.stslex.wizard.core.ui.kit.mvi.Router import com.stslex.wizard.feature.follower.ui.store.FollowerStore.Action.Navigation interface FollowerRouter : Router diff --git a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/navigation/GraphFollower.kt b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/navigation/GraphFollower.kt index bbe82f3..2b9aac0 100644 --- a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/navigation/GraphFollower.kt +++ b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/navigation/GraphFollower.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.remember import androidx.navigation.NavGraphBuilder import com.stslex.wizard.core.navigation.Screen import com.stslex.wizard.core.navigation.navScreen -import com.stslex.wizard.core.ui.mvi.getStore +import com.stslex.wizard.core.ui.kit.mvi.getStore import com.stslex.wizard.feature.follower.ui.FollowerScreen import com.stslex.wizard.feature.follower.ui.store.FollowerStore import com.stslex.wizard.feature.follower.ui.store.FollowerStore.Action diff --git a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/FollowerScreen.kt b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/FollowerScreen.kt index fcbb1a2..fbe15a6 100644 --- a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/FollowerScreen.kt +++ b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/FollowerScreen.kt @@ -6,7 +6,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.base.paging.PagingColumn +import com.stslex.wizard.core.ui.kit.base.paging.PagingColumn import com.stslex.wizard.feature.follower.ui.store.FollowerScreenState import com.stslex.wizard.feature.follower.ui.store.FollowerStore.Action import com.stslex.wizard.feature.follower.ui.store.FollowerStore.State diff --git a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/model/FollowerModel.kt b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/model/FollowerModel.kt index 53bb091..55a21db 100644 --- a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/model/FollowerModel.kt +++ b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/model/FollowerModel.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.follower.ui.model import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem @Stable data class FollowerModel( diff --git a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerScreenState.kt b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerScreenState.kt index b85d706..d172df5 100644 --- a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerScreenState.kt +++ b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerScreenState.kt @@ -1,8 +1,8 @@ package com.stslex.wizard.feature.follower.ui.store import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.base.AppError -import com.stslex.wizard.core.ui.pager.states.PagerLoadState +import com.stslex.wizard.core.ui.kit.base.AppError +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadState @Stable sealed interface FollowerScreenState { diff --git a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerStore.kt b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerStore.kt index 6422dbd..8d6b163 100644 --- a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerStore.kt +++ b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerStore.kt @@ -2,10 +2,10 @@ package com.stslex.wizard.feature.follower.ui.store import androidx.compose.runtime.Stable import com.stslex.wizard.core.navigation.Screen -import com.stslex.wizard.core.ui.base.paging.PagingConfig -import com.stslex.wizard.core.ui.base.paging.PagingUiState -import com.stslex.wizard.core.ui.mvi.CommonEvents -import com.stslex.wizard.core.ui.mvi.Store +import com.stslex.wizard.core.ui.kit.base.paging.PagingConfig +import com.stslex.wizard.core.ui.kit.base.paging.PagingUiState +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents +import com.stslex.wizard.core.ui.kit.mvi.Store import com.stslex.wizard.feature.follower.ui.model.FollowerModel import com.stslex.wizard.feature.follower.ui.store.FollowerStore.Action import com.stslex.wizard.feature.follower.ui.store.FollowerStore.Event diff --git a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerStoreImpl.kt b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerStoreImpl.kt index 08932aa..55e48a9 100644 --- a/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerStoreImpl.kt +++ b/feature/follower/src/commonMain/kotlin/com/stslex/wizard/feature/follower/ui/store/FollowerStoreImpl.kt @@ -1,13 +1,13 @@ package com.stslex.wizard.feature.follower.ui.store import com.stslex.wizard.core.navigation.Screen.Follower.FollowerType -import com.stslex.wizard.core.ui.base.mapToAppError -import com.stslex.wizard.core.ui.base.paging.toUi -import com.stslex.wizard.core.ui.mvi.BaseStore -import com.stslex.wizard.core.ui.mvi.CommonEvents.Snackbar -import com.stslex.wizard.core.ui.pager.pager.StorePager -import com.stslex.wizard.core.ui.pager.pager.StorePagerFactory -import com.stslex.wizard.core.ui.pager.states.PagerLoadState +import com.stslex.wizard.core.ui.kit.base.mapToAppError +import com.stslex.wizard.core.ui.kit.base.paging.toUi +import com.stslex.wizard.core.ui.kit.mvi.BaseStore +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents.Snackbar +import com.stslex.wizard.core.ui.kit.pager.pager.StorePager +import com.stslex.wizard.core.ui.kit.pager.pager.StorePagerFactory +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadState import com.stslex.wizard.feature.follower.domain.interactor.FollowerInteractor import com.stslex.wizard.feature.follower.navigation.FollowerRouter import com.stslex.wizard.feature.follower.ui.model.FollowerModel diff --git a/feature/match/build.gradle.kts b/feature/match/build.gradle.kts index 1220507..5dc2370 100644 --- a/feature/match/build.gradle.kts +++ b/feature/match/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { sourceSets.commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:network:api")) implementation(project(":core:database")) implementation(project(":core:navigation")) diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/data/model/MatchDataModel.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/data/model/MatchDataModel.kt index 872b200..a5a7dd1 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/data/model/MatchDataModel.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/data/model/MatchDataModel.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.match.data.model -import com.stslex.wizard.core.ui.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem data class MatchDataModel( override val uuid: String, diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/di/ModuleFeatureMatch.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/di/ModuleFeatureMatch.kt index 1f2bc23..637367b 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/di/ModuleFeatureMatch.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/di/ModuleFeatureMatch.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.match.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.mvi.storeOf +import com.stslex.wizard.core.ui.kit.mvi.storeOf import com.stslex.wizard.feature.match.data.repository.MatchRepository import com.stslex.wizard.feature.match.data.repository.MatchRepositoryImpl import com.stslex.wizard.feature.match.domain.interactor.MatchInteractor diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/domain/model/MatchDomainModel.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/domain/model/MatchDomainModel.kt index 88ec404..1cdbdf4 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/domain/model/MatchDomainModel.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/domain/model/MatchDomainModel.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.match.domain.model -import com.stslex.wizard.core.ui.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem data class MatchDomainModel( override val uuid: String, diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/navigation/GraphMatch.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/navigation/GraphMatch.kt index f5fa70e..a60cecd 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/navigation/GraphMatch.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/navigation/GraphMatch.kt @@ -8,7 +8,7 @@ import androidx.compose.runtime.remember import androidx.navigation.NavGraphBuilder import com.stslex.wizard.core.navigation.Screen import com.stslex.wizard.core.navigation.navScreen -import com.stslex.wizard.core.ui.mvi.getStore +import com.stslex.wizard.core.ui.kit.mvi.getStore import com.stslex.wizard.feature.match.ui.MatchScreen import com.stslex.wizard.feature.match.ui.store.MatchStore import com.stslex.wizard.feature.match.ui.store.MatchStore.Action diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/navigation/MatchRouter.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/navigation/MatchRouter.kt index b7487cc..1843c17 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/navigation/MatchRouter.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/navigation/MatchRouter.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.match.navigation -import com.stslex.wizard.core.ui.mvi.Router +import com.stslex.wizard.core.ui.kit.mvi.Router import com.stslex.wizard.feature.match.ui.store.MatchStore interface MatchRouter : Router \ No newline at end of file diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/MatchScreen.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/MatchScreen.kt index 66e714a..dcd42be 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/MatchScreen.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/MatchScreen.kt @@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.components.AppSnackbarHost +import com.stslex.wizard.core.ui.kit.components.AppSnackbarHost import com.stslex.wizard.feature.match.ui.components.MatchScreenContent import com.stslex.wizard.feature.match.ui.components.MatchScreenEmpty import com.stslex.wizard.feature.match.ui.components.MatchScreenError diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/components/MatchScreenContent.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/components/MatchScreenContent.kt index f8d1453..b236812 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/components/MatchScreenContent.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/components/MatchScreenContent.kt @@ -17,10 +17,10 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.base.paging.PagingColumn -import com.stslex.wizard.core.ui.base.paging.PagingUiState -import com.stslex.wizard.core.ui.base.shimmerLoadingAnimation -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.base.paging.PagingColumn +import com.stslex.wizard.core.ui.kit.base.paging.PagingUiState +import com.stslex.wizard.core.ui.kit.base.shimmerLoadingAnimation +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.match.ui.model.MatchUiModel import com.stslex.wizard.feature.match.ui.store.MatchScreenState import com.stslex.wizard.feature.match.ui.store.MatchStore.Action diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/components/MatchScreenError.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/components/MatchScreenError.kt index b4e4781..7ee52c9 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/components/MatchScreenError.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/components/MatchScreenError.kt @@ -11,8 +11,8 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.base.AppError -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.base.AppError +import com.stslex.wizard.core.ui.kit.theme.AppDimension @Composable internal fun MatchScreenError( diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/model/MatchDataMapper.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/model/MatchDataMapper.kt index eb62b74..5cb66ca 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/model/MatchDataMapper.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/model/MatchDataMapper.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.match.ui.model import com.stslex.wizard.core.core.asyncMap -import com.stslex.wizard.core.ui.pager.states.PagerLoadState +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadState import com.stslex.wizard.feature.match.domain.model.MatchDomainModel import com.stslex.wizard.feature.match.domain.model.MatchDomainStatus import com.stslex.wizard.feature.match.domain.model.MatchUserDomainModel diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/model/MatchUiModel.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/model/MatchUiModel.kt index 07224dd..f67c4b1 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/model/MatchUiModel.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/model/MatchUiModel.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.match.ui.model import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.base.paging.PagingItem +import com.stslex.wizard.core.ui.kit.base.paging.PagingItem import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchScreenState.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchScreenState.kt index ae3359f..42d3c99 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchScreenState.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchScreenState.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.match.ui.store import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.base.AppError +import com.stslex.wizard.core.ui.kit.base.AppError @Stable sealed interface MatchScreenState { diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchStore.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchStore.kt index 0cd711a..a7fa73f 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchStore.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchStore.kt @@ -2,10 +2,10 @@ package com.stslex.wizard.feature.match.ui.store import androidx.compose.runtime.Stable import com.stslex.wizard.core.navigation.Screen -import com.stslex.wizard.core.ui.base.paging.PagingConfig -import com.stslex.wizard.core.ui.base.paging.PagingUiState -import com.stslex.wizard.core.ui.mvi.CommonEvents -import com.stslex.wizard.core.ui.mvi.Store +import com.stslex.wizard.core.ui.kit.base.paging.PagingConfig +import com.stslex.wizard.core.ui.kit.base.paging.PagingUiState +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents +import com.stslex.wizard.core.ui.kit.mvi.Store import com.stslex.wizard.feature.match.ui.model.MatchUiModel import com.stslex.wizard.feature.match.ui.store.MatchStore.Action import com.stslex.wizard.feature.match.ui.store.MatchStore.Event diff --git a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchStoreImpl.kt b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchStoreImpl.kt index b4e8246..9767d0a 100644 --- a/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchStoreImpl.kt +++ b/feature/match/src/commonMain/kotlin/com/stslex/wizard/feature/match/ui/store/MatchStoreImpl.kt @@ -3,13 +3,13 @@ package com.stslex.wizard.feature.match.ui.store import com.stslex.wizard.core.core.Logger import com.stslex.wizard.core.database.store.UserStore import com.stslex.wizard.core.navigation.Screen -import com.stslex.wizard.core.ui.base.mapToAppError -import com.stslex.wizard.core.ui.base.paging.toUi -import com.stslex.wizard.core.ui.mvi.BaseStore -import com.stslex.wizard.core.ui.mvi.CommonEvents.Snackbar -import com.stslex.wizard.core.ui.pager.pager.StorePager -import com.stslex.wizard.core.ui.pager.pager.StorePagerFactory -import com.stslex.wizard.core.ui.pager.states.PagerLoadState +import com.stslex.wizard.core.ui.kit.base.mapToAppError +import com.stslex.wizard.core.ui.kit.base.paging.toUi +import com.stslex.wizard.core.ui.kit.mvi.BaseStore +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents.Snackbar +import com.stslex.wizard.core.ui.kit.pager.pager.StorePager +import com.stslex.wizard.core.ui.kit.pager.pager.StorePagerFactory +import com.stslex.wizard.core.ui.kit.pager.states.PagerLoadState import com.stslex.wizard.feature.match.domain.interactor.MatchInteractor import com.stslex.wizard.feature.match.navigation.MatchRouter import com.stslex.wizard.feature.match.ui.model.MatchUiModel diff --git a/feature/match_feed/build.gradle.kts b/feature/match_feed/build.gradle.kts index 9eaf337..42dfd8b 100644 --- a/feature/match_feed/build.gradle.kts +++ b/feature/match_feed/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { sourceSets.commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:network:api")) implementation(project(":core:navigation")) } diff --git a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/di/ModuleFeatureMatchFeed.kt b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/di/ModuleFeatureMatchFeed.kt index 5e035a4..9b78ef6 100644 --- a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/di/ModuleFeatureMatchFeed.kt +++ b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/di/ModuleFeatureMatchFeed.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.match_feed.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.mvi.storeOf +import com.stslex.wizard.core.ui.kit.mvi.storeOf import com.stslex.wizard.feature.match_feed.data.repository.MatchFeedMockRepositoryImpl import com.stslex.wizard.feature.match_feed.data.repository.MatchFeedRepository import com.stslex.wizard.feature.match_feed.domain.MatchFeedInteractor diff --git a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/navigation/GraphMatchFeed.kt b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/navigation/GraphMatchFeed.kt index 4e31727..81b430b 100644 --- a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/navigation/GraphMatchFeed.kt +++ b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/navigation/GraphMatchFeed.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.remember import androidx.navigation.NavGraphBuilder import com.stslex.wizard.core.navigation.Screen import com.stslex.wizard.core.navigation.navScreen -import com.stslex.wizard.core.ui.mvi.getStore +import com.stslex.wizard.core.ui.kit.mvi.getStore import com.stslex.wizard.feature.match_feed.ui.MatchFeedScreen import com.stslex.wizard.feature.match_feed.ui.store.MatchFeedStore import com.stslex.wizard.feature.match_feed.ui.store.MatchFeedStore.Action diff --git a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/navigation/MatchFeedRouter.kt b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/navigation/MatchFeedRouter.kt index 7bbd98f..9d05ae5 100644 --- a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/navigation/MatchFeedRouter.kt +++ b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/navigation/MatchFeedRouter.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.match_feed.navigation -import com.stslex.wizard.core.ui.mvi.Router +import com.stslex.wizard.core.ui.kit.mvi.Router import com.stslex.wizard.feature.match_feed.ui.store.MatchFeedStore interface MatchFeedRouter : Router diff --git a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/components/MatchFeedScreenFilmItem.kt b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/components/MatchFeedScreenFilmItem.kt index 96d54e8..f11d660 100644 --- a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/components/MatchFeedScreenFilmItem.kt +++ b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/components/MatchFeedScreenFilmItem.kt @@ -35,9 +35,9 @@ import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp -import com.stslex.wizard.core.ui.base.image.AppImage -import com.stslex.wizard.core.ui.base.onClickDelay -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.base.image.AppImage +import com.stslex.wizard.core.ui.kit.base.onClickDelay +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.match_feed.ui.model.FilmUi import kotlinx.collections.immutable.ImmutableList import kotlinx.coroutines.delay diff --git a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/store/MatchFeedStore.kt b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/store/MatchFeedStore.kt index fd27343..a2850f0 100644 --- a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/store/MatchFeedStore.kt +++ b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/store/MatchFeedStore.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.match_feed.ui.store import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.mvi.Store +import com.stslex.wizard.core.ui.kit.mvi.Store import com.stslex.wizard.feature.match_feed.ui.components.SwipeDirection import com.stslex.wizard.feature.match_feed.ui.model.FilmUi import com.stslex.wizard.feature.match_feed.ui.model.MatchUi diff --git a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/store/MatchFeedStoreImpl.kt b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/store/MatchFeedStoreImpl.kt index af4dafd..3e145e6 100644 --- a/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/store/MatchFeedStoreImpl.kt +++ b/feature/match_feed/src/commonMain/kotlin/com/stslex/wizard/feature/match_feed/ui/store/MatchFeedStoreImpl.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.match_feed.ui.store import com.stslex.wizard.core.core.Logger -import com.stslex.wizard.core.ui.mvi.BaseStore +import com.stslex.wizard.core.ui.kit.mvi.BaseStore import com.stslex.wizard.feature.match_feed.domain.MatchFeedInteractor import com.stslex.wizard.feature.match_feed.navigation.MatchFeedRouter import com.stslex.wizard.feature.match_feed.ui.model.toUI diff --git a/feature/profile/build.gradle.kts b/feature/profile/build.gradle.kts index 1220507..5dc2370 100644 --- a/feature/profile/build.gradle.kts +++ b/feature/profile/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { sourceSets.commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:network:api")) implementation(project(":core:database")) implementation(project(":core:navigation")) diff --git a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/di/ModuleFeatureProfile.kt b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/di/ModuleFeatureProfile.kt index 6ce0163..39f857e 100644 --- a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/di/ModuleFeatureProfile.kt +++ b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/di/ModuleFeatureProfile.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.profile.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.mvi.storeOf +import com.stslex.wizard.core.ui.kit.mvi.storeOf import com.stslex.wizard.feature.profile.data.repository.ProfileRepository import com.stslex.wizard.feature.profile.data.repository.ProfileRepositoryImpl import com.stslex.wizard.feature.profile.domain.interactor.ProfileInteractor diff --git a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/navigation/GraphProfile.kt b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/navigation/GraphProfile.kt index 404f715..fb12a2c 100644 --- a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/navigation/GraphProfile.kt +++ b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/navigation/GraphProfile.kt @@ -8,7 +8,7 @@ import androidx.compose.runtime.remember import androidx.navigation.NavGraphBuilder import com.stslex.wizard.core.navigation.Screen import com.stslex.wizard.core.navigation.navScreen -import com.stslex.wizard.core.ui.mvi.getStore +import com.stslex.wizard.core.ui.kit.mvi.getStore import com.stslex.wizard.feature.profile.ui.ProfileScreen import com.stslex.wizard.feature.profile.ui.store.ProfileStoreImpl import com.stslex.wizard.feature.profile.ui.store.ProfileStore.Action diff --git a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/navigation/ProfileRouter.kt b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/navigation/ProfileRouter.kt index 8f7d899..af581bd 100644 --- a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/navigation/ProfileRouter.kt +++ b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/navigation/ProfileRouter.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.profile.navigation -import com.stslex.wizard.core.ui.mvi.Router +import com.stslex.wizard.core.ui.kit.mvi.Router import com.stslex.wizard.feature.profile.ui.store.ProfileStore interface ProfileRouter : Router \ No newline at end of file diff --git a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/ProfileScreen.kt b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/ProfileScreen.kt index fff1760..c3b7828 100644 --- a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/ProfileScreen.kt +++ b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/ProfileScreen.kt @@ -16,8 +16,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import com.stslex.wizard.core.core.error.ErrorRefresh -import com.stslex.wizard.core.ui.components.AppSnackbarHost -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.components.AppSnackbarHost +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.profile.ui.components.ProfileScreenContent import com.stslex.wizard.feature.profile.ui.store.ProfileScreenState import com.stslex.wizard.feature.profile.ui.store.ProfileStore.Action diff --git a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileAvatar.kt b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileAvatar.kt index 2bf7731..6a3deb6 100644 --- a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileAvatar.kt +++ b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileAvatar.kt @@ -9,8 +9,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import com.stslex.wizard.core.ui.base.image.AppImage -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.base.image.AppImage +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.profile.ui.model.ProfileAvatarModel @Composable diff --git a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileInfo.kt b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileInfo.kt index c4d18cd..e1a04e9 100644 --- a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileInfo.kt +++ b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileInfo.kt @@ -10,7 +10,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.AppDimension @Composable fun ProfileInfo( diff --git a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileScreenToolbar.kt b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileScreenToolbar.kt index 393d86e..dc9f03d 100644 --- a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileScreenToolbar.kt +++ b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/components/ProfileScreenToolbar.kt @@ -7,7 +7,7 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.components.AppToolbar +import com.stslex.wizard.core.ui.kit.components.AppToolbar @Composable fun ProfileScreenToolbar( diff --git a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/store/ProfileStore.kt b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/store/ProfileStore.kt index fe7e868..eab2f78 100644 --- a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/store/ProfileStore.kt +++ b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/store/ProfileStore.kt @@ -2,8 +2,8 @@ package com.stslex.wizard.feature.profile.ui.store import androidx.compose.runtime.Stable import com.stslex.wizard.core.navigation.Screen -import com.stslex.wizard.core.ui.mvi.CommonEvents -import com.stslex.wizard.core.ui.mvi.Store +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents +import com.stslex.wizard.core.ui.kit.mvi.Store import com.stslex.wizard.feature.profile.ui.store.ProfileStore.Action import com.stslex.wizard.feature.profile.ui.store.ProfileStore.Event import com.stslex.wizard.feature.profile.ui.store.ProfileStore.State diff --git a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/store/ProfileStoreImpl.kt b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/store/ProfileStoreImpl.kt index 09d69e2..0a048b7 100644 --- a/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/store/ProfileStoreImpl.kt +++ b/feature/profile/src/commonMain/kotlin/com/stslex/wizard/feature/profile/ui/store/ProfileStoreImpl.kt @@ -3,8 +3,8 @@ package com.stslex.wizard.feature.profile.ui.store import androidx.compose.ui.graphics.Color import com.stslex.wizard.core.database.store.UserStore import com.stslex.wizard.core.navigation.Screen -import com.stslex.wizard.core.ui.mvi.BaseStore -import com.stslex.wizard.core.ui.mvi.CommonEvents.Snackbar +import com.stslex.wizard.core.ui.kit.mvi.BaseStore +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents.Snackbar import com.stslex.wizard.feature.profile.domain.interactor.ProfileInteractor import com.stslex.wizard.feature.profile.navigation.ProfileRouter import com.stslex.wizard.feature.profile.ui.model.ProfileAvatarModel diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts index 9f9e5a2..4cb9e77 100644 --- a/feature/settings/build.gradle.kts +++ b/feature/settings/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin { sourceSets.commonMain.dependencies { implementation(project(":core:core")) - implementation(project(":core:ui")) + implementation(project(":core:ui:kit")) implementation(project(":core:network:api")) implementation(project(":core:database")) implementation(project(":core:navigation")) diff --git a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/di/ModuleFeatureSettings.kt b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/di/ModuleFeatureSettings.kt index 9280760..1845c8f 100644 --- a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/di/ModuleFeatureSettings.kt +++ b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/di/ModuleFeatureSettings.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.settings.di import com.stslex.wizard.core.core.AppModule -import com.stslex.wizard.core.ui.mvi.storeOf +import com.stslex.wizard.core.ui.kit.mvi.storeOf import com.stslex.wizard.feature.settings.domain.SettingsInteractor import com.stslex.wizard.feature.settings.domain.SettingsInteractorImpl import com.stslex.wizard.feature.settings.navigation.SettingsRouter diff --git a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/navigation/GraphSettings.kt b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/navigation/GraphSettings.kt index 0be69c4..79289d5 100644 --- a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/navigation/GraphSettings.kt +++ b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/navigation/GraphSettings.kt @@ -8,7 +8,7 @@ import androidx.compose.runtime.remember import androidx.navigation.NavGraphBuilder import com.stslex.wizard.core.navigation.Screen import com.stslex.wizard.core.navigation.navScreen -import com.stslex.wizard.core.ui.mvi.getStore +import com.stslex.wizard.core.ui.kit.mvi.getStore import com.stslex.wizard.feature.settings.ui.SettingsScreen import com.stslex.wizard.feature.settings.ui.store.SettingsStoreImpl import com.stslex.wizard.feature.settings.ui.store.SettingsStore.Event diff --git a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/navigation/SettingsRouter.kt b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/navigation/SettingsRouter.kt index b4157e6..d1e4c02 100644 --- a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/navigation/SettingsRouter.kt +++ b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/navigation/SettingsRouter.kt @@ -1,6 +1,6 @@ package com.stslex.wizard.feature.settings.navigation -import com.stslex.wizard.core.ui.mvi.Router +import com.stslex.wizard.core.ui.kit.mvi.Router import com.stslex.wizard.feature.settings.ui.store.SettingsStore interface SettingsRouter : Router diff --git a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/SettingsScreen.kt b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/SettingsScreen.kt index 7026205..b6c5a01 100644 --- a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/SettingsScreen.kt +++ b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/SettingsScreen.kt @@ -11,9 +11,9 @@ import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import com.stslex.wizard.core.ui.components.AppSnackbarHost -import com.stslex.wizard.core.ui.components.AppToolbar -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.components.AppSnackbarHost +import com.stslex.wizard.core.ui.kit.components.AppToolbar +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.settings.ui.components.SettingsContent import com.stslex.wizard.feature.settings.ui.store.SettingsStore.Action import com.stslex.wizard.feature.settings.ui.store.SettingsStore.State diff --git a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/components/SettingsContent.kt b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/components/SettingsContent.kt index 64d1a32..b14c6a8 100644 --- a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/components/SettingsContent.kt +++ b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/components/SettingsContent.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.style.TextOverflow -import com.stslex.wizard.core.ui.theme.AppDimension +import com.stslex.wizard.core.ui.kit.theme.AppDimension import com.stslex.wizard.feature.settings.ui.model.SettingsColumnItems @Composable diff --git a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/store/SettingsStore.kt b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/store/SettingsStore.kt index b8d1e7a..51f038d 100644 --- a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/store/SettingsStore.kt +++ b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/store/SettingsStore.kt @@ -1,8 +1,8 @@ package com.stslex.wizard.feature.settings.ui.store import androidx.compose.runtime.Stable -import com.stslex.wizard.core.ui.mvi.CommonEvents -import com.stslex.wizard.core.ui.mvi.Store +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents +import com.stslex.wizard.core.ui.kit.mvi.Store import com.stslex.wizard.feature.settings.ui.store.SettingsStore.Action import com.stslex.wizard.feature.settings.ui.store.SettingsStore.Event import com.stslex.wizard.feature.settings.ui.store.SettingsStore.State diff --git a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/store/SettingsStoreImpl.kt b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/store/SettingsStoreImpl.kt index 16c730d..0faa8ff 100644 --- a/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/store/SettingsStoreImpl.kt +++ b/feature/settings/src/commonMain/kotlin/com/stslex/wizard/feature/settings/ui/store/SettingsStoreImpl.kt @@ -1,7 +1,7 @@ package com.stslex.wizard.feature.settings.ui.store -import com.stslex.wizard.core.ui.mvi.BaseStore -import com.stslex.wizard.core.ui.mvi.CommonEvents.Snackbar +import com.stslex.wizard.core.ui.kit.mvi.BaseStore +import com.stslex.wizard.core.ui.kit.mvi.CommonEvents.Snackbar import com.stslex.wizard.feature.settings.domain.SettingsInteractor import com.stslex.wizard.feature.settings.navigation.SettingsRouter import com.stslex.wizard.feature.settings.ui.store.SettingsStore.Action diff --git a/settings.gradle.kts b/settings.gradle.kts index fbadc49..9cf6536 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,13 +20,18 @@ rootProject.name = "Wizard" include(":iosApp") include(":commonApp") +// Core include(":core:core") +// Network include(":core:network:client") include(":core:network:api") -include(":core:ui") +// UI +include(":core:ui:kit") +include(":core:ui:image") +// Other include(":core:database") include(":core:navigation") - +// Features include(":feature:film_feed") include(":feature:film") include(":feature:profile")