1. Added below modules such as Common, Data, CoreUi, Test, Feature

2. Moved YCoreUiLib into Core ui
3. Added Hilt dependency
4. Code cleaning

Author: sreekuttan-yml

YCoreUILib/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     id("co.yml.coreui.application")
     id("co.yml.coreui.application.jacoco")
     id("co.yml.coreui.application.compose")
+    id("co.yml.coreui.hilt")
 }
 
 android {
@@ -11,21 +12,22 @@ android {
         applicationId = "co.yml.coreui"
         versionCode = 1
         versionName = "1.0"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 }
 
 dependencies {
+    implementation(versionCatalogLibs.hilt.nav.compose)
     implementation(versionCatalogLibs.androidx.lifecycle.viewModelCompose)
 
-    implementation(project(mapOf("path" to ":YCoreUILib")))
+    implementation(project(mapOf("path" to ":core:ui")))
+    implementation(project(mapOf("path" to ":feature:ytag")))
 
-    androidTestImplementation(versionCatalogLibs.androidx.junit)
     androidTestImplementation(versionCatalogLibs.androidx.test.core)
     androidTestImplementation(versionCatalogLibs.androidx.test.core.ktx)
     androidTestImplementation(versionCatalogLibs.androidx.test.ext)
     androidTestImplementation(versionCatalogLibs.androidx.test.runner)
     androidTestImplementation(versionCatalogLibs.androidx.test.rules)
-
     debugImplementation("androidx.compose.ui:ui-test-manifest:${versionCatalogLibs.versions.compose.ui.testing}")
+
+    androidTestImplementation(project(mapOf("path" to ":core:test")))
 }

YCoreUILib/src/test/java/co/yml/ycoreui/ExampleUnitTest.kt

@@ -6,6 +6,8 @@ import androidx.test.core.app.launchActivity
 import androidx.test.ext.junit.rules.activityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
@@ -16,8 +18,12 @@ import org.junit.runner.RunWith
  *
  * @constructor Create empty Main activity test
  */
+@HiltAndroidTest
 @RunWith(AndroidJUnit4::class)
 class MainActivityTest {
+    @get:Rule(order = 0)
+    var hiltRule = HiltAndroidRule(this)
+
     @get:Rule(order = 1)
     var activityScenarioRule = activityScenarioRule<MainActivity>()
 

app/build.gradle.kts

@@ -26,7 +26,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.presentation.YTagActivity"/>
+        <activity android:name=".feature.ytag.ui.YTagActivity"/>
     </application>
 
 </manifest>

app/src/androidTest/java/co/yml/coreui/MainActivityTest.kt

@@ -1,8 +1,10 @@
 package co.yml.coreui
 
 import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
 
 /**
  * Application class.
  */
+@HiltAndroidApp
 class CoreUICatalog : Application()

app/src/main/AndroidManifest.xml

@@ -11,16 +11,19 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.ui.Modifier
-import co.yml.coreui.ui.compositions.AppBar
+import co.yml.coreui.feature.ytag.ui.YTagActivity
+import co.yml.coreui.core.ui.templates.AppBar
+import co.yml.coreui.core.ui.theme.CoreUICatalogTheme
+import co.yml.coreui.ui.R
 import co.yml.coreui.ui.presentation.CoreUIComponents
-import co.yml.coreui.ui.presentation.YTagActivity
-import co.yml.coreui.ui.theme.CoreUICatalogTheme
+import dagger.hilt.android.AndroidEntryPoint
 
 /**
- * Main activity: Launcher Activity
+ * [MainActivity]: Launcher Activity
  *
  * @constructor Create empty Main activity
  */
+@AndroidEntryPoint
 class MainActivity : ComponentActivity() {
     @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/co/yml/coreui/CoreUICatalog.kt

@@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
-import co.yml.coreui.R
-import co.yml.coreui.ui.theme.CoreUICatalogTheme
+import co.yml.coreui.core.ui.theme.CoreUICatalogTheme
+import co.yml.coreui.ui.R
 
 @Composable
 fun CoreUIComponents(title: String, onClick: () -> Unit) {