Moving SearchModule to search module and removing the dependencies th…

…at are not needed
WiiliamChik · Apr 16, 2019 · 8d4b553 · 8d4b553
1 parent 8951a60
commit 8d4b553
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/search/src/main/java/io/plaidapp/search/dagger/SearchModule.kt b/search/src/main/java/io/plaidapp/search/dagger/SearchModule.kt
@@ -24,8 +24,6 @@ import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import io.plaidapp.R
-import io.plaidapp.core.dagger.designernews.DesignerNewsDataModule
-import io.plaidapp.core.dagger.dribbble.DribbbleDataModule
 import io.plaidapp.core.dagger.qualifier.IsPocketInstalled
 import io.plaidapp.core.data.pocket.PocketUtils
 import io.plaidapp.core.interfaces.SearchDataSourceFactory
@@ -34,12 +32,7 @@ import io.plaidapp.search.ui.SearchActivity
 import io.plaidapp.search.ui.SearchViewModel
 import io.plaidapp.search.ui.SearchViewModelFactory
 
-@Module(
-    includes = [
-        DribbbleDataModule::class,
-        DesignerNewsDataModule::class
-    ]
-)
+@Module
 abstract class SearchModule {
 
     @Binds

diff --git a/...aces/SearchDataSourceFactoriesRegistry.kt → ...main/SearchDataSourceFactoriesRegistry.kt b/...aces/SearchDataSourceFactoriesRegistry.kt → ...main/SearchDataSourceFactoriesRegistry.kt
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package io.plaidapp.core.interfaces
+package io.plaidapp.search.domain
 
+import io.plaidapp.core.interfaces.SearchDataSourceFactory
 import javax.inject.Inject
 import javax.inject.Provider
 

diff --git a/search/src/main/java/io/plaidapp/search/ui/SearchViewModel.kt b/search/src/main/java/io/plaidapp/search/ui/SearchViewModel.kt
@@ -24,7 +24,7 @@ import androidx.lifecycle.viewModelScope
 import io.plaidapp.core.data.CoroutinesDispatcherProvider
 import io.plaidapp.core.feed.FeedProgressUiModel
 import io.plaidapp.core.feed.FeedUiModel
-import io.plaidapp.core.interfaces.SearchDataSourceFactoriesRegistry
+import io.plaidapp.search.domain.SearchDataSourceFactoriesRegistry
 import io.plaidapp.search.domain.SearchUseCase
 import kotlinx.coroutines.launch
 

diff --git a/search/src/main/java/io/plaidapp/search/ui/SearchViewModelFactory.kt b/search/src/main/java/io/plaidapp/search/ui/SearchViewModelFactory.kt
@@ -19,7 +19,7 @@ package io.plaidapp.search.ui
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import io.plaidapp.core.data.CoroutinesDispatcherProvider
-import io.plaidapp.core.interfaces.SearchDataSourceFactoriesRegistry
+import io.plaidapp.search.domain.SearchDataSourceFactoriesRegistry
 import javax.inject.Inject
 
 /**

diff --git a/search/src/test/java/io/plaidapp/search/ui/SearchViewModelTest.kt b/search/src/test/java/io/plaidapp/search/ui/SearchViewModelTest.kt
@@ -23,7 +23,7 @@ import io.plaidapp.core.data.PlaidItem
 import io.plaidapp.core.data.Result
 import io.plaidapp.core.data.SourceItem
 import io.plaidapp.core.interfaces.PlaidDataSource
-import io.plaidapp.core.interfaces.SearchDataSourceFactoriesRegistry
+import io.plaidapp.search.domain.SearchDataSourceFactoriesRegistry
 import io.plaidapp.core.interfaces.SearchDataSourceFactory
 import io.plaidapp.search.shots
 import io.plaidapp.search.testShot1