simplify app structure

simplify app structure

Author: alekshawtf

processor/build.gradle

@@ -1,4 +1,4 @@
 apply from: "${project.rootDir}/gradle/kotlin/processor.gradle"
 
 group = 'com.kotlitecture.kotli'
-version = '0.13.0'
+version = '0.14.0'

processor/src/main/kotlin/kotli/template/multiplatform/compose/Rules.kt

@@ -32,20 +32,17 @@ object Rules {
     const val AppBuildGradle = "${App}/build.gradle.kts"
     const val AppCommonMain = "${AppSrc}/commonMain"
     const val AppCommonMainRoot = "${AppCommonMain}/kotlin/kotli/app"
+    const val AppKt = "${AppCommonMainRoot}/app/App.kt"
+    const val AppConfigKt = "${AppCommonMainRoot}/app/AppConfig.kt"
+    const val AppViewModelKt = "${AppCommonMainRoot}/app/AppViewModel.kt"
+
+    // app -> common
     const val AppCommon = "${AppCommonMainRoot}/common"
-    const val AppFeature = "${AppCommonMainRoot}/feature"
-    const val AppKt = "${AppCommonMainRoot}/App.kt"
-    const val AppConfigKt = "${AppCommonMainRoot}/AppConfig.kt"
-    const val AppViewModelKt = "${AppCommonMainRoot}/AppViewModel.kt"
     const val AppCommonPresentation = "${AppCommon}/presentation"
     const val AppCommonConfigKt = "${AppCommon}/CommonConfig.kt"
-    const val AppConfigureKoinKt = "*/configureKoin.kt"
-
-    // app -> di
-    const val AppDI = "${AppCommonMainRoot}/di"
-    const val AppDiKt = "${AppDI}/DI.kt"
 
     // app -> misc
+    const val AppConfigureKoinKt = "*/configureKoin.kt"
     const val AppProguardRulesPro = "${App}/assemble/proguard-rules.pro"
     const val AppWebPackConfigDir = "app/webpack.config.d"
     const val AppSqlDelightConfigJs = "${AppWebPackConfigDir}/sqljs-config.js"
@@ -56,23 +53,21 @@ object Rules {
     // app -> common -> presentation -> navigation
     const val AppCommonNavigation = "${AppCommonPresentation}/navigation"
 
-    // app -> feature -> passcode
-    const val AppPasscode = "${AppFeature}/passcode"
-    const val AppDIPasscodeModuleKt = "${AppDI}/feature/PasscodeModule.kt"
+    // app -> passcode
+    const val AppPasscode = "${AppCommonMainRoot}/passcode"
 
-    // app -> feature -> theme
-    const val AppTheme = "${AppFeature}/theme"
+    // app -> theme
+    const val AppTheme = "${AppCommonMainRoot}/theme"
     const val AppThemeConfigKt = "${AppTheme}/ThemeConfig.kt"
-    const val AppDIThemeModuleKt = "${AppDI}/feature/ThemeModule.kt"
 
-    // app -> feature -> navigation
-    const val AppNavigation = "${AppFeature}/navigation"
+    // app -> navigation
+    const val AppNavigation = "${AppCommonMainRoot}/navigation"
     const val AppNavigationProvider = "${AppNavigation}/provide/presentation/NavigationProvider.kt"
     const val AppBottomNavigationProvider = "${AppNavigation}/provide/presentation/BottomNavigationProvider.kt"
     const val AppNavigationViewModel = "${AppNavigation}/provide/presentation/NavigationViewModel.kt"
 
-    // app -> feature -> showcases
-    const val AppShowcases = "${AppFeature}/showcases"
+    // app -> showcases
+    const val AppShowcases = "${AppCommonMainRoot}/showcases"
     const val AppShowcasesDataflow = "${AppShowcases}/presentation/dataflow"
     const val AppShowcasesUserflow = "${AppShowcases}/presentation/userflow"
     const val AppShowcasesViewModelKt = "${AppShowcases}/presentation/ShowcasesViewModel.kt"

processor/src/main/kotlin/kotli/template/multiplatform/compose/dataflow/ai/gemini/GeminiProcessor.kt

@@ -19,7 +19,9 @@ object GeminiProcessor : BaseFeatureProcessor() {
     override fun getId(): String = ID
     override fun getTags(): List<FeatureTag> = Tags.AllClients
     override fun getWebUrl(state: TemplateState): String = "https://github.com/PatilShreyas/generative-ai-kmp"
-    override fun getIntegrationUrl(state: TemplateState): String = "https://github.com/PatilShreyas/generative-ai-kmp?tab=readme-ov-file#installation-and-usage"
+    override fun getIntegrationUrl(state: TemplateState): String =
+        "https://github.com/PatilShreyas/generative-ai-kmp?tab=readme-ov-file#installation-and-usage"
+
     override fun getIntegrationEstimate(state: TemplateState): Long = 1.hours.inWholeMilliseconds
 
     override fun dependencies(): List<Class<out FeatureProcessor>> = listOf(
@@ -41,8 +43,8 @@ object GeminiProcessor : BaseFeatureProcessor() {
             )
         )
         state.onApplyRules(
-            Rules.AppDiKt,
-            RemoveMarkedLine("aiSource")
+            Rules.AppCommonConfigKt,
+            RemoveMarkedLine("ai")
         )
     }
 

processor/src/main/kotlin/kotli/template/multiplatform/compose/dataflow/analytics/facade/FacadeAnalyticsProcessor.kt

@@ -23,7 +23,7 @@ object FacadeAnalyticsProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDiKt,
+            Rules.AppCommonConfigKt,
             RemoveMarkedLine("AnalyticsSource")
         )
     }

processor/src/main/kotlin/kotli/template/multiplatform/compose/dataflow/cache/basic/BasicCacheProcessor.kt

@@ -42,7 +42,7 @@ object BasicCacheProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDiKt,
+            Rules.AppCommonConfigKt,
             RemoveMarkedLine("CacheSource")
         )
         state.onApplyRules(

processor/src/main/kotlin/kotli/template/multiplatform/compose/dataflow/config/facade/FacadeConfigProcessor.kt

@@ -23,7 +23,7 @@ object FacadeConfigProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDiKt,
+            Rules.AppCommonConfigKt,
             RemoveMarkedLine("ConfigSource")
         )
     }

processor/src/main/kotlin/kotli/template/multiplatform/compose/dataflow/database/room/RoomProcessor.kt

@@ -81,7 +81,7 @@ object RoomProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDiKt,
+            Rules.AppCommonConfigKt,
             RemoveMarkedLine("RoomSource")
         )
         state.onApplyRules(

processor/src/main/kotlin/kotli/template/multiplatform/compose/dataflow/database/sqldelight/SqlDelightProcessor.kt

@@ -82,12 +82,12 @@ object SqlDelightProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDiKt,
+            Rules.AppCommonConfigKt,
             RemoveMarkedLine("SqlDelightSource")
         )
         state.onApplyRules(
-            "*/createSqlDriver.kt",
-            RemoveFile()
+            "*/PlatformConfig.*.kt",
+            RemoveMarkedLine("sql"),
         )
     }
 

processor/src/main/kotlin/kotli/template/multiplatform/compose/dataflow/encryption/korlibs/KorlibsEncryptionProcessor.kt

@@ -32,7 +32,7 @@ object KorlibsEncryptionProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDiKt,
+            Rules.AppCommonConfigKt,
             RemoveMarkedLine("EncryptionSource")
         )
         state.onApplyRules(

processor/src/main/kotlin/kotli/template/multiplatform/compose/dataflow/http/ktor/KtorHttpProcessor.kt

@@ -35,7 +35,7 @@ object KtorHttpProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDiKt,
+            Rules.AppCommonConfigKt,
             RemoveMarkedLine("HttpSource")
         )
         state.onApplyRules(