ferPrieto
diff --git a/‎app/build.gradle.kts
-1 b/‎app/build.gradle.kts
-1
diff --git a/‎app/src/main/java/prieto/fernando/spacex/presentation/screens/dashboard/DashboardContract.kt
+3-3 b/‎app/src/main/java/prieto/fernando/spacex/presentation/screens/dashboard/DashboardContract.kt
+3-3
diff --git a/‎app/src/main/java/prieto/fernando/spacex/presentation/screens/launches/LaunchesContract.kt
+3-3 b/‎app/src/main/java/prieto/fernando/spacex/presentation/screens/launches/LaunchesContract.kt
+3-3
diff --git a/‎app/src/main/java/prieto/fernando/spacex/presentation/vm/DashboardViewModel.kt
+2-3 b/‎app/src/main/java/prieto/fernando/spacex/presentation/vm/DashboardViewModel.kt
+2-3
diff --git a/‎app/src/main/java/prieto/fernando/spacex/presentation/vm/LaunchesViewModel.kt
+2-3 b/‎app/src/main/java/prieto/fernando/spacex/presentation/vm/LaunchesViewModel.kt
+2-3
diff --git a/‎core/src/main/java/prieto/fernando/core/presentation/BaseComponents.kt ‎app/src/main/java/prieto/fernando/spacex/presentation/vm/base/BaseComponents.kt
+1-1 b/‎core/src/main/java/prieto/fernando/core/presentation/BaseComponents.kt ‎app/src/main/java/prieto/fernando/spacex/presentation/vm/base/BaseComponents.kt
+1-1
diff --git a/‎core/build.gradle.kts
-21 b/‎core/build.gradle.kts
-21
diff --git a/‎core/consumer-rules.pro b/‎core/consumer-rules.pro
diff --git a/‎core/proguard-rules.pro
-21 b/‎core/proguard-rules.pro
-21
diff --git a/‎core/src/main/AndroidManifest.xml
-2 b/‎core/src/main/AndroidManifest.xml
-2
diff --git a/‎settings.gradle.kts
-1 b/‎settings.gradle.kts
-1
@@ -47,7 +47,6 @@ android {
 }
 
 dependencies {
-    implementation(project(ProjectModules.core))
     implementation(project(ProjectModules.api))
     implementation(project(ProjectModules.domain))
     implementation(project(ProjectModules.data))
 
@@ -1,8 +1,8 @@
 package prieto.fernando.spacex.presentation.screens.dashboard
 
-import prieto.fernando.core.presentation.ViewEvent
-import prieto.fernando.core.presentation.ViewSideEffect
-import prieto.fernando.core.presentation.ViewState
+import prieto.fernando.spacex.presentation.vm.base.ViewEvent
+import prieto.fernando.spacex.presentation.vm.base.ViewSideEffect
+import prieto.fernando.spacex.presentation.vm.base.ViewState
 
 class DashboardContract {
     sealed class Event : ViewEvent
 
@@ -1,8 +1,8 @@
 package prieto.fernando.spacex.presentation.screens.launches
 
-import prieto.fernando.core.presentation.ViewEvent
-import prieto.fernando.core.presentation.ViewSideEffect
-import prieto.fernando.core.presentation.ViewState
+import prieto.fernando.spacex.presentation.vm.base.ViewEvent
+import prieto.fernando.spacex.presentation.vm.base.ViewSideEffect
+import prieto.fernando.spacex.presentation.vm.base.ViewState
 
 const val LAUNCH_LISTEN_FOR_EFFECTS = "launch-listen-to-effects"
 
 
@@ -6,7 +6,7 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import prieto.fernando.core.presentation.BaseViewModel
+import prieto.fernando.spacex.presentation.vm.base.BaseViewModel
 import prieto.fernando.domain.usecase.GetCompanyInfo
 import prieto.fernando.spacex.presentation.screens.dashboard.CompanyInfoUiModel
 import prieto.fernando.spacex.presentation.screens.dashboard.DashboardContract
@@ -18,8 +18,7 @@ import javax.inject.Inject
 class DashboardViewModel @Inject constructor(
     private val getCompanyInfo: GetCompanyInfo,
     private val companyInfoDomainToUiModelMapper: CompanyInfoDomainToUiModelMapper
-) : BaseViewModel
-<DashboardContract.Event, DashboardContract.State, DashboardContract.Effect>() {
+) : BaseViewModel<DashboardContract.Event, DashboardContract.State, DashboardContract.Effect>() {
 
     private val errorHandler = CoroutineExceptionHandler { _, exception ->
         Timber.e(exception)
 
@@ -6,7 +6,7 @@ import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
-import prieto.fernando.core.presentation.BaseViewModel
+import prieto.fernando.spacex.presentation.vm.base.BaseViewModel
 import prieto.fernando.domain.usecase.GetLaunches
 import prieto.fernando.spacex.presentation.screens.launches.LaunchesContract
 import prieto.fernando.spacex.presentation.screens.launches.LinksUiModel
@@ -18,8 +18,7 @@ import javax.inject.Inject
 class LaunchesViewModel @Inject constructor(
     private val getLaunches: GetLaunches,
     private val launchesDomainToUiModelMapper: LaunchesDomainToUiModelMapper
-) : BaseViewModel
-<LaunchesContract.Event, LaunchesContract.State, LaunchesContract.Effect>() {
+) : BaseViewModel<LaunchesContract.Event, LaunchesContract.State, LaunchesContract.Effect>() {
 
     private val errorHandler = CoroutineExceptionHandler { _, exception ->
         Timber.e(exception)
 
@@ -1,4 +1,4 @@
-package prieto.fernando.core.presentation
+package prieto.fernando.spacex.presentation.vm.base
 
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.State
 
@@ -3,7 +3,6 @@ rootProject.buildFileName = "build.gradle.kts"
 
 include(
     ":app",
-    ":core",
     ":data-api",
     ":data",
     ":domain",
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ android {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`dependencies {`
`50`		`- implementation(project(ProjectModules.core))`
`51`	`50`	`implementation(project(ProjectModules.api))`
`52`	`51`	`implementation(project(ProjectModules.domain))`
`53`	`52`	`implementation(project(ProjectModules.data))`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package prieto.fernando.core.presentation`
	`1`	`+package prieto.fernando.spacex.presentation.vm.base`
`2`	`2`
`3`	`3`	`import androidx.compose.runtime.MutableState`
`4`	`4`	`import androidx.compose.runtime.State`