From 54785283ab47989e261f78bf615edd1e01fad68a Mon Sep 17 00:00:00 2001 From: Aleksha Date: Sun, 30 Jun 2024 17:06:36 +0300 Subject: [PATCH] refac --- .../template/multiplatform/compose/Rules.kt | 23 ++++++---- .../kotli/app/di/presentation/AppModule.kt | 24 +++++------ .../app/presentation/showcases/Showcases.kt | 42 +++++++++---------- .../cache/basic/BasicCacheDestination.kt | 4 +- .../cache/basic/BasicCacheScreen.kt | 2 +- .../cache/basic/BasicCacheShowcase.kt | 6 +-- .../cache/basic/BasicCacheViewModel.kt | 2 +- .../http/basic/BasicHttpDestination.kt | 2 +- .../http/basic/BasicHttpScreen.kt | 2 +- .../http/basic/BasicHttpShowcase.kt | 2 +- .../http/basic/BasicHttpViewModel.kt | 2 +- .../object/ObjectKeyValueDestination.kt | 2 +- .../keyvalue/object/ObjectKeyValueScreen.kt | 2 +- .../keyvalue/object/ObjectKeyValueShowcase.kt | 2 +- .../object/ObjectKeyValueViewModel.kt | 2 +- .../primitive/PrimitiveKeyValueDestination.kt | 2 +- .../primitive/PrimitiveKeyValueScreen.kt | 2 +- .../primitive/PrimitiveKeyValueShowcase.kt | 2 +- .../primitive/PrimitiveKeyValueViewModel.kt | 2 +- .../paging/basic/BasicPagingDestination.kt | 2 +- .../paging/basic/BasicPagingScreen.kt | 2 +- .../paging/basic/BasicPagingShowcase.kt | 2 +- .../paging/basic/BasicPagingSource.kt | 2 +- .../paging/basic/BasicPagingViewModel.kt | 2 +- .../crud/SqlDelightCrudDestination.kt | 2 +- .../sqldelight/crud/SqlDelightCrudScreen.kt | 2 +- .../sqldelight/crud/SqlDelightCrudShowcase.kt | 2 +- .../crud/SqlDelightCrudViewModel.kt | 2 +- .../paging/SqlDelightPagingDestination.kt | 2 +- .../paging/SqlDelightPagingScreen.kt | 2 +- .../paging/SqlDelightPagingShowcase.kt | 2 +- .../paging/SqlDelightPagingSource.kt | 2 +- .../paging/SqlDelightPagingViewModel.kt | 2 +- .../loader/data/DataLoaderShowcase.kt | 2 +- .../data/DataLoaderShowcaseDestination.kt | 2 +- .../loader/data/DataLoaderShowcaseScreen.kt | 2 +- .../data/DataLoaderShowcaseViewModel.kt | 2 +- .../navigation/args/ArgsNavigationShowcase.kt | 6 +-- .../from/ArgsNavigationFromDestination.kt | 2 +- .../args/from/ArgsNavigationFromScreen.kt | 6 +-- .../args/from/ArgsNavigationFromViewModel.kt | 4 +- .../args/to/ArgsNavigationToDestination.kt | 2 +- .../args/to/ArgsNavigationToScreen.kt | 4 +- .../args/to/ArgsNavigationToViewModel.kt | 2 +- .../no_args/NoArgsNavigationShowcase.kt | 6 +-- .../from/NoArgsNavigationFromDestination.kt | 2 +- .../from/NoArgsNavigationFromScreen.kt | 4 +- .../from/NoArgsNavigationFromViewModel.kt | 4 +- .../to/NoArgsNavigationToDestination.kt | 2 +- .../no_args/to/NoArgsNavigationToScreen.kt | 4 +- .../no_args/to/NoArgsNavigationToViewModel.kt | 2 +- .../theme/change/ChangeThemeDialogShowcase.kt | 2 +- .../theme/change/ChangeThemeScreenShowcase.kt | 2 +- .../theme/toggle/ToggleThemeShowcase.kt | 2 +- 54 files changed, 112 insertions(+), 107 deletions(-) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/cache/basic/BasicCacheDestination.kt (74%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/cache/basic/BasicCacheScreen.kt (95%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/cache/basic/BasicCacheShowcase.kt (70%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/cache/basic/BasicCacheViewModel.kt (95%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/http/basic/BasicHttpDestination.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/http/basic/BasicHttpScreen.kt (96%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/http/basic/BasicHttpShowcase.kt (88%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/http/basic/BasicHttpViewModel.kt (96%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/keyvalue/object/ObjectKeyValueDestination.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/keyvalue/object/ObjectKeyValueScreen.kt (95%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/keyvalue/object/ObjectKeyValueShowcase.kt (88%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/keyvalue/object/ObjectKeyValueViewModel.kt (96%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/keyvalue/primitive/PrimitiveKeyValueDestination.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/keyvalue/primitive/PrimitiveKeyValueScreen.kt (95%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/keyvalue/primitive/PrimitiveKeyValueShowcase.kt (88%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/keyvalue/primitive/PrimitiveKeyValueViewModel.kt (93%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/paging/basic/BasicPagingDestination.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/paging/basic/BasicPagingScreen.kt (95%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/paging/basic/BasicPagingShowcase.kt (88%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/paging/basic/BasicPagingSource.kt (93%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/paging/basic/BasicPagingViewModel.kt (90%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/sqldelight/crud/SqlDelightCrudDestination.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/sqldelight/crud/SqlDelightCrudScreen.kt (97%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/sqldelight/crud/SqlDelightCrudShowcase.kt (88%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/sqldelight/crud/SqlDelightCrudViewModel.kt (95%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/sqldelight/paging/SqlDelightPagingDestination.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/sqldelight/paging/SqlDelightPagingScreen.kt (96%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/sqldelight/paging/SqlDelightPagingShowcase.kt (88%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/sqldelight/paging/SqlDelightPagingSource.kt (94%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{datasource => dataflow}/sqldelight/paging/SqlDelightPagingViewModel.kt (97%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{feature => userflow}/loader/data/DataLoaderShowcase.kt (89%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{feature => userflow}/loader/data/DataLoaderShowcaseDestination.kt (88%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{feature => userflow}/loader/data/DataLoaderShowcaseScreen.kt (95%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{feature => userflow}/loader/data/DataLoaderShowcaseViewModel.kt (89%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/args/ArgsNavigationShowcase.kt (68%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/args/from/ArgsNavigationFromDestination.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/args/from/ArgsNavigationFromScreen.kt (93%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/args/from/ArgsNavigationFromViewModel.kt (78%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/args/to/ArgsNavigationToDestination.kt (91%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/args/to/ArgsNavigationToScreen.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/args/to/ArgsNavigationToViewModel.kt (79%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/no_args/NoArgsNavigationShowcase.kt (68%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/no_args/from/NoArgsNavigationFromDestination.kt (86%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/no_args/from/NoArgsNavigationFromScreen.kt (92%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/no_args/from/NoArgsNavigationFromViewModel.kt (67%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/no_args/to/NoArgsNavigationToDestination.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/no_args/to/NoArgsNavigationToScreen.kt (87%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{ => userflow}/navigation/no_args/to/NoArgsNavigationToViewModel.kt (81%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{feature => userflow}/theme/change/ChangeThemeDialogShowcase.kt (90%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{feature => userflow}/theme/change/ChangeThemeScreenShowcase.kt (90%) rename template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/{feature => userflow}/theme/toggle/ToggleThemeShowcase.kt (96%) diff --git a/processor/src/main/kotlin/kotli/template/multiplatform/compose/Rules.kt b/processor/src/main/kotlin/kotli/template/multiplatform/compose/Rules.kt index b1f99886..30984c3b 100644 --- a/processor/src/main/kotlin/kotli/template/multiplatform/compose/Rules.kt +++ b/processor/src/main/kotlin/kotli/template/multiplatform/compose/Rules.kt @@ -6,6 +6,7 @@ object Rules { const val StringsXml = "*/strings.xml" const val IndexHtml = "*/index.html" const val IosConfig = "*/Config.xcconfig" + // gradle const val BuildGradle = "*build.gradle.kts" const val SettingsGradle = "settings.gradle.kts" @@ -15,6 +16,7 @@ object Rules { const val BuildGradleSharedData = "shared/data/build.gradle.kts" const val BuildGradleSharedDesign = "shared/design/build.gradle.kts" const val BuildGradleSharedDomain = "shared/domain/build.gradle.kts" + // proguard const val ProguardRulesPro = "app/assemble/proguard-rules.pro" @@ -59,19 +61,22 @@ object Rules { const val AppNavigationPermanentProvider = "${AppNavigationDir}/PermanentProvider.kt" const val AppNavigationRailProvider = "${AppNavigationDir}/RailProvider.kt" const val ShowcasesDir = "${AppPresentationDir}/showcases" - const val ShowcasesHttpDir = "${ShowcasesDir}/datasource/http" - const val ShowcasesCacheDir = "${ShowcasesDir}/datasource/cache" - const val ShowcasesPagingDir = "${ShowcasesDir}/datasource/paging" - const val ShowcasesKeyValueDir = "${ShowcasesDir}/datasource/keyvalue" - const val ShowcasesSqlDelightDir = "${ShowcasesDir}/datasource/sqldelight" - const val ShowcasesNavigationDir = "${ShowcasesDir}/navigation" - const val ShowcasesThemeDir = "${ShowcasesDir}/feature/theme" - const val ShowcasesLoaderDir = "${ShowcasesDir}/feature/loader" - const val ShowcasesPasscodeDir = "${ShowcasesDir}/feature/passcode" + const val ShowcasesDataFlowDir = "${ShowcasesDir}/dataflow" + const val ShowcasesUserFlowDir = "${ShowcasesDir}/userflow" + const val ShowcasesHttpDir = "${ShowcasesDataFlowDir}/http" + const val ShowcasesCacheDir = "${ShowcasesDataFlowDir}/cache" + const val ShowcasesPagingDir = "${ShowcasesDataFlowDir}/paging" + const val ShowcasesKeyValueDir = "${ShowcasesDataFlowDir}/keyvalue" + const val ShowcasesSqlDelightDir = "${ShowcasesDataFlowDir}/sqldelight" + const val ShowcasesNavigationDir = "${ShowcasesUserFlowDir}/navigation" + const val ShowcasesThemeDir = "${ShowcasesUserFlowDir}/theme" + const val ShowcasesLoaderDir = "${ShowcasesUserFlowDir}/loader" + const val ShowcasesPasscodeDir = "${ShowcasesUserFlowDir}/passcode" const val ShowcasesKt = "${ShowcasesDir}/Showcases.kt" const val ThemeStoreKt = "${SharedPresentationDir}/src/commonMain/kotlin/shared/presentation/theme/ThemeStore.kt" const val NavigationBarModuleKt = "${CommonAppMainDir}/kotlin/kotli/app/di/presentation/NavigationBarModule.kt" const val NavigationModuleKt = "${CommonAppMainDir}/kotlin/kotli/app/di/presentation/NavigationModule.kt" + // dataflow const val AppConfigSource = "${CommonAppMainDir}/kotlin/kotli/app/datasource/config/AppConfigSource.kt" const val AnalyticsSource = "*/*AnalyticsSource*.kt" diff --git a/template/app/src/commonMain/kotlin/kotli/app/di/presentation/AppModule.kt b/template/app/src/commonMain/kotlin/kotli/app/di/presentation/AppModule.kt index dbf9a84e..925e2b15 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/di/presentation/AppModule.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/di/presentation/AppModule.kt @@ -12,18 +12,18 @@ import kotli.app.presentation.navigation.samples.c.NavigationCViewModel import kotli.app.presentation.theme.change.ChangeThemeViewModel import kotli.app.presentation.theme.toggle.ToggleThemeViewModel import kotli.app.presentation.showcases.ShowcasesViewModel -import kotli.app.presentation.showcases.datasource.cache.basic.BasicCacheViewModel -import kotli.app.presentation.showcases.datasource.http.basic.BasicHttpViewModel -import kotli.app.presentation.showcases.datasource.keyvalue.`object`.ObjectKeyValueViewModel -import kotli.app.presentation.showcases.datasource.keyvalue.primitive.PrimitiveKeyValueViewModel -import kotli.app.presentation.showcases.datasource.paging.basic.BasicPagingViewModel -import kotli.app.presentation.showcases.datasource.sqldelight.crud.SqlDelightCrudViewModel -import kotli.app.presentation.showcases.datasource.sqldelight.paging.SqlDelightPagingViewModel -import kotli.app.presentation.showcases.feature.loader.data.DataLoaderShowcaseViewModel -import kotli.app.presentation.showcases.navigation.args.from.ArgsNavigationFromViewModel -import kotli.app.presentation.showcases.navigation.args.to.ArgsNavigationToViewModel -import kotli.app.presentation.showcases.navigation.no_args.from.NoArgsNavigationFromViewModel -import kotli.app.presentation.showcases.navigation.no_args.to.NoArgsNavigationToViewModel +import kotli.app.presentation.showcases.dataflow.cache.basic.BasicCacheViewModel +import kotli.app.presentation.showcases.dataflow.http.basic.BasicHttpViewModel +import kotli.app.presentation.showcases.dataflow.keyvalue.`object`.ObjectKeyValueViewModel +import kotli.app.presentation.showcases.dataflow.keyvalue.primitive.PrimitiveKeyValueViewModel +import kotli.app.presentation.showcases.dataflow.paging.basic.BasicPagingViewModel +import kotli.app.presentation.showcases.dataflow.sqldelight.crud.SqlDelightCrudViewModel +import kotli.app.presentation.showcases.dataflow.sqldelight.paging.SqlDelightPagingViewModel +import kotli.app.presentation.showcases.userflow.loader.data.DataLoaderShowcaseViewModel +import kotli.app.presentation.showcases.userflow.navigation.args.from.ArgsNavigationFromViewModel +import kotli.app.presentation.showcases.userflow.navigation.args.to.ArgsNavigationToViewModel +import kotli.app.presentation.showcases.userflow.navigation.no_args.from.NoArgsNavigationFromViewModel +import kotli.app.presentation.showcases.userflow.navigation.no_args.to.NoArgsNavigationToViewModel import kotli.app.presentation.loader.LoaderViewModel import kotli.app.presentation.template.screen_with_args.TemplateViewModel import kotli.app.presentation.template.screen_without_args.TemplateNoArgsViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/Showcases.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/Showcases.kt index ac653403..59e6782e 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/Showcases.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/Showcases.kt @@ -1,18 +1,18 @@ package kotli.app.presentation.showcases -import kotli.app.presentation.showcases.datasource.cache.basic.BasicCacheShowcase -import kotli.app.presentation.showcases.datasource.http.basic.BasicHttpShowcase -import kotli.app.presentation.showcases.datasource.keyvalue.`object`.ObjectKeyValueShowcase -import kotli.app.presentation.showcases.datasource.keyvalue.primitive.PrimitiveKeyValueShowcase -import kotli.app.presentation.showcases.datasource.paging.basic.BasicPagingShowcase -import kotli.app.presentation.showcases.datasource.sqldelight.crud.SqlDelightCrudShowcase -import kotli.app.presentation.showcases.datasource.sqldelight.paging.SqlDelightPagingShowcase -import kotli.app.presentation.showcases.feature.loader.data.DataLoaderShowcase -import kotli.app.presentation.showcases.feature.theme.change.ChangeThemeDialogShowcase -import kotli.app.presentation.showcases.feature.theme.change.ChangeThemeScreenShowcase -import kotli.app.presentation.showcases.feature.theme.toggle.ToggleThemeShowcase -import kotli.app.presentation.showcases.navigation.args.ArgsNavigationShowcase -import kotli.app.presentation.showcases.navigation.no_args.NoArgsNavigationShowcase +import kotli.app.presentation.showcases.dataflow.cache.basic.BasicCacheShowcase +import kotli.app.presentation.showcases.dataflow.http.basic.BasicHttpShowcase +import kotli.app.presentation.showcases.dataflow.keyvalue.`object`.ObjectKeyValueShowcase +import kotli.app.presentation.showcases.dataflow.keyvalue.primitive.PrimitiveKeyValueShowcase +import kotli.app.presentation.showcases.dataflow.paging.basic.BasicPagingShowcase +import kotli.app.presentation.showcases.dataflow.sqldelight.crud.SqlDelightCrudShowcase +import kotli.app.presentation.showcases.dataflow.sqldelight.paging.SqlDelightPagingShowcase +import kotli.app.presentation.showcases.userflow.loader.data.DataLoaderShowcase +import kotli.app.presentation.showcases.userflow.theme.change.ChangeThemeDialogShowcase +import kotli.app.presentation.showcases.userflow.theme.change.ChangeThemeScreenShowcase +import kotli.app.presentation.showcases.userflow.theme.toggle.ToggleThemeShowcase +import kotli.app.presentation.showcases.userflow.navigation.args.ArgsNavigationShowcase +import kotli.app.presentation.showcases.userflow.navigation.no_args.NoArgsNavigationShowcase /** * Object containing all showcase items. @@ -23,21 +23,21 @@ object Showcases { * A list containing all showcase items. */ val all = listOf( - ShowcaseItemGroup("Navigation + MVVM"), - NoArgsNavigationShowcase, - ArgsNavigationShowcase, - ShowcaseItemGroup("Datasource :: Cache"), + ShowcaseItemGroup("Dataflow :: Cache"), BasicCacheShowcase, - ShowcaseItemGroup("Datasource :: Http"), + ShowcaseItemGroup("Dataflow :: Http"), BasicHttpShowcase, - ShowcaseItemGroup("Datasource :: KeyValue"), + ShowcaseItemGroup("Dataflow :: KeyValue"), PrimitiveKeyValueShowcase, ObjectKeyValueShowcase, - ShowcaseItemGroup("Datasource :: Paging"), + ShowcaseItemGroup("Dataflow :: Paging"), BasicPagingShowcase, - ShowcaseItemGroup("Datasource :: SqlDelight"), + ShowcaseItemGroup("Dataflow :: SqlDelight"), SqlDelightCrudShowcase, SqlDelightPagingShowcase, + ShowcaseItemGroup("Userflow :: Navigation + MVVM"), + NoArgsNavigationShowcase, + ArgsNavigationShowcase, ShowcaseItemGroup("Userflow :: Loader"), DataLoaderShowcase, ShowcaseItemGroup("Userflow :: Theme"), diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheDestination.kt similarity index 74% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheDestination.kt index e20977f7..b485d4d5 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.cache.basic +package kotli.app.presentation.showcases.dataflow.cache.basic import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs @@ -8,6 +8,6 @@ object BasicCacheDestination : NavigationDestinationNoArgs() { override val id: String = "basic_cache_screen" override val navStrategy: NavigationStrategy = NavigationStrategy.NewInstance - override fun doBind(builder: NavGraphBuilder) = composable(builder) { kotli.app.presentation.showcases.datasource.cache.basic.BasicCacheScreen() } + override fun doBind(builder: NavGraphBuilder) = composable(builder) { kotli.app.presentation.showcases.dataflow.cache.basic.BasicCacheScreen() } } \ No newline at end of file diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheScreen.kt similarity index 95% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheScreen.kt index c828d28e..1dad6674 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.cache.basic +package kotli.app.presentation.showcases.dataflow.cache.basic import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheShowcase.kt similarity index 70% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheShowcase.kt index 80d112ea..d0cf6f3f 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.cache.basic +package kotli.app.presentation.showcases.dataflow.cache.basic import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel @@ -9,11 +9,11 @@ object BasicCacheShowcase : ShowcaseItem { override val label: String = "Basic In-Memory Cache Usage" override fun onClick(viewModel: ShowcasesViewModel) { - viewModel.navigationStore.onNext(kotli.app.presentation.showcases.datasource.cache.basic.BasicCacheDestination) + viewModel.navigationStore.onNext(kotli.app.presentation.showcases.dataflow.cache.basic.BasicCacheDestination) } override fun dependsOn(): List> = listOf( - kotli.app.presentation.showcases.datasource.cache.basic.BasicCacheDestination + kotli.app.presentation.showcases.dataflow.cache.basic.BasicCacheDestination ) } \ No newline at end of file diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheViewModel.kt similarity index 95% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheViewModel.kt index d2505211..daca0187 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/cache/basic/BasicCacheViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/cache/basic/BasicCacheViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.cache.basic +package kotli.app.presentation.showcases.dataflow.cache.basic import kotlinx.coroutines.flow.collectLatest import kotlinx.datetime.Clock diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpDestination.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpDestination.kt index 03602150..b4f4401e 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.http.basic +package kotli.app.presentation.showcases.dataflow.http.basic import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpScreen.kt similarity index 96% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpScreen.kt index 0f28e67b..e196ba9e 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.http.basic +package kotli.app.presentation.showcases.dataflow.http.basic import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpShowcase.kt similarity index 88% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpShowcase.kt index 29670275..affa9d4e 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.http.basic +package kotli.app.presentation.showcases.dataflow.http.basic import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpViewModel.kt similarity index 96% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpViewModel.kt index 35a9af94..b621ac1b 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/http/basic/BasicHttpViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/http/basic/BasicHttpViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.http.basic +package kotli.app.presentation.showcases.dataflow.http.basic import io.ktor.client.call.body import io.ktor.client.request.get diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueDestination.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueDestination.kt index 8b5ccef6..4737bb4e 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.keyvalue.`object` +package kotli.app.presentation.showcases.dataflow.keyvalue.`object` import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueScreen.kt similarity index 95% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueScreen.kt index 96c08eff..991d25d7 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.keyvalue.`object` +package kotli.app.presentation.showcases.dataflow.keyvalue.`object` import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueShowcase.kt similarity index 88% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueShowcase.kt index 766a4d72..e8e145db 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.keyvalue.`object` +package kotli.app.presentation.showcases.dataflow.keyvalue.`object` import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueViewModel.kt similarity index 96% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueViewModel.kt index c2cd3ba3..da6bb3ee 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/object/ObjectKeyValueViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/object/ObjectKeyValueViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.keyvalue.`object` +package kotli.app.presentation.showcases.dataflow.keyvalue.`object` import kotli.app.data.source.keyvalue.AppKeyValueSource import kotlinx.coroutines.flow.collectLatest diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueDestination.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueDestination.kt index f0fb5d39..22c843e7 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.keyvalue.primitive +package kotli.app.presentation.showcases.dataflow.keyvalue.primitive import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueScreen.kt similarity index 95% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueScreen.kt index 568931e2..752bd710 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.keyvalue.primitive +package kotli.app.presentation.showcases.dataflow.keyvalue.primitive import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueShowcase.kt similarity index 88% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueShowcase.kt index f0e06397..fb4733c3 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.keyvalue.primitive +package kotli.app.presentation.showcases.dataflow.keyvalue.primitive import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueViewModel.kt similarity index 93% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueViewModel.kt index 7be2c093..e7a17a69 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/keyvalue/primitive/PrimitiveKeyValueViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/keyvalue/primitive/PrimitiveKeyValueViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.keyvalue.primitive +package kotli.app.presentation.showcases.dataflow.keyvalue.primitive import kotli.app.data.source.keyvalue.AppKeyValueSource import kotlinx.coroutines.flow.collectLatest diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingDestination.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingDestination.kt index c96e9142..80e4b400 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.paging.basic +package kotli.app.presentation.showcases.dataflow.paging.basic import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingScreen.kt similarity index 95% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingScreen.kt index 21fd3219..75563265 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.paging.basic +package kotli.app.presentation.showcases.dataflow.paging.basic import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingShowcase.kt similarity index 88% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingShowcase.kt index 308a0581..6ad6eb2d 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.paging.basic +package kotli.app.presentation.showcases.dataflow.paging.basic import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingSource.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingSource.kt similarity index 93% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingSource.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingSource.kt index 26b95002..a0090299 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingSource.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingSource.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.paging.basic +package kotli.app.presentation.showcases.dataflow.paging.basic import app.cash.paging.PagingSource import app.cash.paging.PagingSourceLoadParams diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingViewModel.kt similarity index 90% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingViewModel.kt index 50f4e5c7..becd7d45 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/paging/basic/BasicPagingViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/paging/basic/BasicPagingViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.paging.basic +package kotli.app.presentation.showcases.dataflow.paging.basic import androidx.lifecycle.viewModelScope import app.cash.paging.cachedIn diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudDestination.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudDestination.kt index 96583aea..3b8fbdd9 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.sqldelight.crud +package kotli.app.presentation.showcases.dataflow.sqldelight.crud import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudScreen.kt similarity index 97% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudScreen.kt index b11f5351..74d097c6 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.sqldelight.crud +package kotli.app.presentation.showcases.dataflow.sqldelight.crud import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudShowcase.kt similarity index 88% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudShowcase.kt index c0bf9f33..8b714d80 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.sqldelight.crud +package kotli.app.presentation.showcases.dataflow.sqldelight.crud import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudViewModel.kt similarity index 95% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudViewModel.kt index 82845981..3e3f14a3 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/crud/SqlDelightCrudViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/crud/SqlDelightCrudViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.sqldelight.crud +package kotli.app.presentation.showcases.dataflow.sqldelight.crud import app.cash.sqldelight.async.coroutines.awaitAsList import app.cash.sqldelight.async.coroutines.awaitAsOne diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingDestination.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingDestination.kt index 7a13b08f..ccccae20 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.sqldelight.paging +package kotli.app.presentation.showcases.dataflow.sqldelight.paging import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingScreen.kt similarity index 96% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingScreen.kt index b0c8058d..ca12fdde 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.sqldelight.paging +package kotli.app.presentation.showcases.dataflow.sqldelight.paging import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingShowcase.kt similarity index 88% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingShowcase.kt index 14434b4a..086c7bc9 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.sqldelight.paging +package kotli.app.presentation.showcases.dataflow.sqldelight.paging import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingSource.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingSource.kt similarity index 94% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingSource.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingSource.kt index 0663b243..87312b62 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingSource.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingSource.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.sqldelight.paging +package kotli.app.presentation.showcases.dataflow.sqldelight.paging import app.cash.paging.PagingSource import app.cash.paging.PagingSourceLoadParams diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingViewModel.kt similarity index 97% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingViewModel.kt index d515b9ea..b1d8d581 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/datasource/sqldelight/paging/SqlDelightPagingViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/dataflow/sqldelight/paging/SqlDelightPagingViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.datasource.sqldelight.paging +package kotli.app.presentation.showcases.dataflow.sqldelight.paging import androidx.lifecycle.viewModelScope import app.cash.paging.cachedIn diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcase.kt similarity index 89% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcase.kt index f4512280..e11e1c4f 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.feature.loader.data +package kotli.app.presentation.showcases.userflow.loader.data import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcaseDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcaseDestination.kt similarity index 88% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcaseDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcaseDestination.kt index 80241f0e..e565f0cd 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcaseDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcaseDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.feature.loader.data +package kotli.app.presentation.showcases.userflow.loader.data import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcaseScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcaseScreen.kt similarity index 95% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcaseScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcaseScreen.kt index 17700022..5c7cdc34 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcaseScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcaseScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.feature.loader.data +package kotli.app.presentation.showcases.userflow.loader.data import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcaseViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcaseViewModel.kt similarity index 89% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcaseViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcaseViewModel.kt index c1ed3094..9aa4e832 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/loader/data/DataLoaderShowcaseViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/loader/data/DataLoaderShowcaseViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.feature.loader.data +package kotli.app.presentation.showcases.userflow.loader.data import kotli.app.presentation.app.AppStore import kotlinx.coroutines.delay diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/ArgsNavigationShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/ArgsNavigationShowcase.kt similarity index 68% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/ArgsNavigationShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/ArgsNavigationShowcase.kt index 7d48231e..2f30c7ac 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/ArgsNavigationShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/ArgsNavigationShowcase.kt @@ -1,9 +1,9 @@ -package kotli.app.presentation.showcases.navigation.args +package kotli.app.presentation.showcases.userflow.navigation.args import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel -import kotli.app.presentation.showcases.navigation.args.from.ArgsNavigationFromDestination -import kotli.app.presentation.showcases.navigation.args.to.ArgsNavigationToDestination +import kotli.app.presentation.showcases.userflow.navigation.args.from.ArgsNavigationFromDestination +import kotli.app.presentation.showcases.userflow.navigation.args.to.ArgsNavigationToDestination import shared.presentation.navigation.NavigationDestination object ArgsNavigationShowcase : ShowcaseItem { diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/from/ArgsNavigationFromDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/from/ArgsNavigationFromDestination.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/from/ArgsNavigationFromDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/from/ArgsNavigationFromDestination.kt index dcfe7538..92e7e181 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/from/ArgsNavigationFromDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/from/ArgsNavigationFromDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.args.from +package kotli.app.presentation.showcases.userflow.navigation.args.from import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/from/ArgsNavigationFromScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/from/ArgsNavigationFromScreen.kt similarity index 93% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/from/ArgsNavigationFromScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/from/ArgsNavigationFromScreen.kt index f60c31e2..b432a3c9 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/from/ArgsNavigationFromScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/from/ArgsNavigationFromScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.args.from +package kotli.app.presentation.showcases.userflow.navigation.args.from import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import kotli.app.presentation.showcases.ShowcaseHintBlock -import kotli.app.presentation.showcases.navigation.args.ArgsNavigationShowcase +import kotli.app.presentation.showcases.userflow.navigation.args.ArgsNavigationShowcase import shared.presentation.viewmodel.provideViewModel import shared.presentation.store.DataState import shared.design.component.AppElevatedButton @@ -34,7 +34,7 @@ fun ArgsNavigationFromScreen() { 2. Rename the copied classes (Destination, Screen, and ViewModel) to the desired ones. - 3. Register the copied [Destination] class in `app/di/state/ProvidesNavigationState`. + 3. Register the copied [Destination] class in `app/di/presentation/NavigationModule`. 4. Register the copied [ViewModel] in app/App#AppViewModelFactory. diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/from/ArgsNavigationFromViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/from/ArgsNavigationFromViewModel.kt similarity index 78% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/from/ArgsNavigationFromViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/from/ArgsNavigationFromViewModel.kt index f5dc17a5..018fbbbc 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/from/ArgsNavigationFromViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/from/ArgsNavigationFromViewModel.kt @@ -1,6 +1,6 @@ -package kotli.app.presentation.showcases.navigation.args.from +package kotli.app.presentation.showcases.userflow.navigation.args.from -import kotli.app.presentation.showcases.navigation.args.to.ArgsNavigationToDestination +import kotli.app.presentation.showcases.userflow.navigation.args.to.ArgsNavigationToDestination import shared.presentation.viewmodel.BaseViewModel import shared.presentation.navigation.NavigationStore import shared.presentation.store.DataState diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/to/ArgsNavigationToDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/to/ArgsNavigationToDestination.kt similarity index 91% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/to/ArgsNavigationToDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/to/ArgsNavigationToDestination.kt index 57cfac56..67e35c5c 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/to/ArgsNavigationToDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/to/ArgsNavigationToDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.args.to +package kotli.app.presentation.showcases.userflow.navigation.args.to import androidx.navigation.NavGraphBuilder import kotlinx.serialization.Serializable diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/to/ArgsNavigationToScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/to/ArgsNavigationToScreen.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/to/ArgsNavigationToScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/to/ArgsNavigationToScreen.kt index 8cc38c29..f3007063 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/to/ArgsNavigationToScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/to/ArgsNavigationToScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.args.to +package kotli.app.presentation.showcases.userflow.navigation.args.to import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import kotli.app.presentation.showcases.ShowcaseHintBlock -import kotli.app.presentation.showcases.navigation.args.ArgsNavigationShowcase +import kotli.app.presentation.showcases.userflow.navigation.args.ArgsNavigationShowcase import shared.presentation.viewmodel.provideViewModel import shared.design.component.AppElevatedButton import shared.design.container.AppFixedTopBarColumn diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/to/ArgsNavigationToViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/to/ArgsNavigationToViewModel.kt similarity index 79% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/to/ArgsNavigationToViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/to/ArgsNavigationToViewModel.kt index e2d9932f..e2436d9e 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/args/to/ArgsNavigationToViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/args/to/ArgsNavigationToViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.args.to +package kotli.app.presentation.showcases.userflow.navigation.args.to import shared.presentation.viewmodel.BaseViewModel import shared.presentation.navigation.NavigationStore diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/NoArgsNavigationShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/NoArgsNavigationShowcase.kt similarity index 68% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/NoArgsNavigationShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/NoArgsNavigationShowcase.kt index b08556fd..bac290b2 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/NoArgsNavigationShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/NoArgsNavigationShowcase.kt @@ -1,9 +1,9 @@ -package kotli.app.presentation.showcases.navigation.no_args +package kotli.app.presentation.showcases.userflow.navigation.no_args import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel -import kotli.app.presentation.showcases.navigation.no_args.from.NoArgsNavigationFromDestination -import kotli.app.presentation.showcases.navigation.no_args.to.NoArgsNavigationToDestination +import kotli.app.presentation.showcases.userflow.navigation.no_args.from.NoArgsNavigationFromDestination +import kotli.app.presentation.showcases.userflow.navigation.no_args.to.NoArgsNavigationToDestination import shared.presentation.navigation.NavigationDestination object NoArgsNavigationShowcase : ShowcaseItem { diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/from/NoArgsNavigationFromDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/from/NoArgsNavigationFromDestination.kt similarity index 86% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/from/NoArgsNavigationFromDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/from/NoArgsNavigationFromDestination.kt index 7dd4b160..373f3d33 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/from/NoArgsNavigationFromDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/from/NoArgsNavigationFromDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.no_args.from +package kotli.app.presentation.showcases.userflow.navigation.no_args.from import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/from/NoArgsNavigationFromScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/from/NoArgsNavigationFromScreen.kt similarity index 92% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/from/NoArgsNavigationFromScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/from/NoArgsNavigationFromScreen.kt index 420494a9..a65c9d3f 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/from/NoArgsNavigationFromScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/from/NoArgsNavigationFromScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.no_args.from +package kotli.app.presentation.showcases.userflow.navigation.no_args.from import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import kotli.app.presentation.showcases.ShowcaseHintBlock -import kotli.app.presentation.showcases.navigation.no_args.NoArgsNavigationShowcase +import kotli.app.presentation.showcases.userflow.navigation.no_args.NoArgsNavigationShowcase import shared.presentation.viewmodel.provideViewModel import shared.design.component.AppElevatedButton import shared.design.container.AppFixedTopBarColumn diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/from/NoArgsNavigationFromViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/from/NoArgsNavigationFromViewModel.kt similarity index 67% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/from/NoArgsNavigationFromViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/from/NoArgsNavigationFromViewModel.kt index f6024f3c..95804ce2 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/from/NoArgsNavigationFromViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/from/NoArgsNavigationFromViewModel.kt @@ -1,6 +1,6 @@ -package kotli.app.presentation.showcases.navigation.no_args.from +package kotli.app.presentation.showcases.userflow.navigation.no_args.from -import kotli.app.presentation.showcases.navigation.no_args.to.NoArgsNavigationToDestination +import kotli.app.presentation.showcases.userflow.navigation.no_args.to.NoArgsNavigationToDestination import shared.presentation.viewmodel.BaseViewModel import shared.presentation.navigation.NavigationStore diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/to/NoArgsNavigationToDestination.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/to/NoArgsNavigationToDestination.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/to/NoArgsNavigationToDestination.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/to/NoArgsNavigationToDestination.kt index c70d71fb..6fd78da4 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/to/NoArgsNavigationToDestination.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/to/NoArgsNavigationToDestination.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.no_args.to +package kotli.app.presentation.showcases.userflow.navigation.no_args.to import androidx.navigation.NavGraphBuilder import shared.presentation.navigation.NavigationDestinationNoArgs diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/to/NoArgsNavigationToScreen.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/to/NoArgsNavigationToScreen.kt similarity index 87% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/to/NoArgsNavigationToScreen.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/to/NoArgsNavigationToScreen.kt index 99497f37..26240463 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/to/NoArgsNavigationToScreen.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/to/NoArgsNavigationToScreen.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.no_args.to +package kotli.app.presentation.showcases.userflow.navigation.no_args.to import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import kotli.app.presentation.showcases.ShowcaseHintBlock -import kotli.app.presentation.showcases.navigation.no_args.NoArgsNavigationShowcase +import kotli.app.presentation.showcases.userflow.navigation.no_args.NoArgsNavigationShowcase import shared.presentation.viewmodel.provideViewModel import shared.design.component.AppElevatedButton import shared.design.container.AppFixedTopBarColumn diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/to/NoArgsNavigationToViewModel.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/to/NoArgsNavigationToViewModel.kt similarity index 81% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/to/NoArgsNavigationToViewModel.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/to/NoArgsNavigationToViewModel.kt index d4381b71..3e3ab609 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/navigation/no_args/to/NoArgsNavigationToViewModel.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/navigation/no_args/to/NoArgsNavigationToViewModel.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.navigation.no_args.to +package kotli.app.presentation.showcases.userflow.navigation.no_args.to import shared.presentation.viewmodel.BaseViewModel import shared.presentation.navigation.NavigationStore diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/theme/change/ChangeThemeDialogShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/theme/change/ChangeThemeDialogShowcase.kt similarity index 90% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/theme/change/ChangeThemeDialogShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/theme/change/ChangeThemeDialogShowcase.kt index f8fbf73f..f9fb3aa9 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/theme/change/ChangeThemeDialogShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/theme/change/ChangeThemeDialogShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.feature.theme.change +package kotli.app.presentation.showcases.userflow.theme.change import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/theme/change/ChangeThemeScreenShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/theme/change/ChangeThemeScreenShowcase.kt similarity index 90% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/theme/change/ChangeThemeScreenShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/theme/change/ChangeThemeScreenShowcase.kt index 5b6ef07a..40265783 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/theme/change/ChangeThemeScreenShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/theme/change/ChangeThemeScreenShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.feature.theme.change +package kotli.app.presentation.showcases.userflow.theme.change import kotli.app.presentation.showcases.ShowcaseItem import kotli.app.presentation.showcases.ShowcasesViewModel diff --git a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/theme/toggle/ToggleThemeShowcase.kt b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/theme/toggle/ToggleThemeShowcase.kt similarity index 96% rename from template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/theme/toggle/ToggleThemeShowcase.kt rename to template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/theme/toggle/ToggleThemeShowcase.kt index 59911629..3a1c02e3 100644 --- a/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/feature/theme/toggle/ToggleThemeShowcase.kt +++ b/template/app/src/commonMain/kotlin/kotli/app/presentation/showcases/userflow/theme/toggle/ToggleThemeShowcase.kt @@ -1,4 +1,4 @@ -package kotli.app.presentation.showcases.feature.theme.toggle +package kotli.app.presentation.showcases.userflow.theme.toggle import androidx.compose.foundation.layout.sizeIn import androidx.compose.ui.Modifier