Addressing PR comments

WiiliamChik · Apr 16, 2019 · 29d6a74 · 29d6a74
1 parent 26fb1a2
commit 29d6a74
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 20 deletions.
diff --git a/core/src/main/java/io/plaidapp/core/dagger/CoreDataModule.kt b/core/src/main/java/io/plaidapp/core/dagger/CoreDataModule.kt
@@ -24,6 +24,7 @@ import io.plaidapp.core.BuildConfig
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.converter.gson.GsonConverterFactory
+import javax.inject.Singleton
 
 /**
  * Dagger module to provide core data functionality.
@@ -49,9 +50,11 @@ class CoreDataModule {
     fun provideCallAdapterFactory(): CoroutineCallAdapterFactory = CoroutineCallAdapterFactory()
 
     @Provides
+    @Singleton
     fun provideGson(): Gson = Gson()
 
     @Provides
+    @Singleton
     fun provideGsonConverterFactory(gson: Gson): GsonConverterFactory =
         GsonConverterFactory.create(gson)
 }
diff --git a/designernews/src/main/java/io/plaidapp/designernews/dagger/DesignerNewsSearchComponent.kt b/designernews/src/main/java/io/plaidapp/designernews/dagger/DesignerNewsSearchComponent.kt
@@ -17,19 +17,19 @@
 package io.plaidapp.designernews.dagger
 
 import dagger.Component
-import io.plaidapp.core.dagger.CoreDataModule
+import io.plaidapp.core.dagger.CoreComponent
 import io.plaidapp.core.dagger.designernews.DesignerNewsDataModule
 import io.plaidapp.core.dagger.scope.FeatureScope
 import io.plaidapp.core.interfaces.SearchDataSourceFactory
 
 @Component(
     modules = [
-        CoreDataModule::class,
         DataModule::class,
         DesignerNewsDataModule::class,
         SearchDataModule::class,
         DesignerNewsPreferencesModule::class
-    ]
+    ],
+    dependencies = [CoreComponent::class]
 )
 @FeatureScope
 interface DesignerNewsSearchComponent {

diff --git a/designernews/src/main/java/io/plaidapp/designernews/dagger/SearchDataModule.kt b/designernews/src/main/java/io/plaidapp/designernews/dagger/SearchDataModule.kt
@@ -23,7 +23,7 @@ import io.plaidapp.core.designernews.data.stories.StoriesRepository
 import io.plaidapp.core.interfaces.SearchDataSourceFactory
 import io.plaidapp.designernews.domain.search.DesignerNewsSearchDataSourceFactory
 
-@Module(includes = [DesignerNewsPreferencesModule::class])
+@Module
 class SearchDataModule {
 
     @Provides

diff --git a/...ava/io/plaidapp/designernews/domain/search/DesignerNewsSearchDataSourceFactoryProvider.kt b/...ava/io/plaidapp/designernews/domain/search/DesignerNewsSearchDataSourceFactoryProvider.kt
@@ -21,6 +21,7 @@ import io.plaidapp.core.interfaces.SearchDataSourceFactory
 import io.plaidapp.core.interfaces.SearchDataSourceFactoryProvider
 import io.plaidapp.designernews.dagger.DaggerDesignerNewsSearchComponent
 import io.plaidapp.designernews.dagger.DesignerNewsPreferencesModule
+import io.plaidapp.ui.PlaidApplication.Companion.coreComponent
 
 /**
  * Provider for DesignerNews implementations of [SearchDataSourceFactory]
@@ -33,6 +34,7 @@ class DesignerNewsSearchDataSourceFactoryProvider : SearchDataSourceFactoryProvi
      */
     override fun getFactory(context: Context): SearchDataSourceFactory {
         return DaggerDesignerNewsSearchComponent.builder()
+            .coreComponent(coreComponent(context))
             .designerNewsPreferencesModule(
                 DesignerNewsPreferencesModule(context)
             )

diff --git a/dribbble/src/main/java/io/plaidapp/dribbble/dagger/DribbbleSearchComponent.kt b/dribbble/src/main/java/io/plaidapp/dribbble/dagger/DribbbleSearchComponent.kt
@@ -17,6 +17,7 @@
 package io.plaidapp.dribbble.dagger
 
 import dagger.Component
+import io.plaidapp.core.dagger.CoreComponent
 import io.plaidapp.core.dagger.dribbble.DribbbleDataModule
 import io.plaidapp.core.dagger.scope.FeatureScope
 import io.plaidapp.core.interfaces.SearchDataSourceFactory
@@ -26,7 +27,7 @@ import io.plaidapp.core.interfaces.SearchDataSourceFactory
         DribbbleDataModule::class,
         SearchDataModule::class
     ],
-    dependencies = [io.plaidapp.core.dagger.CoreComponent::class]
+    dependencies = [CoreComponent::class]
 )
 @FeatureScope
 interface DribbbleSearchComponent {

diff --git a/search/src/main/java/io/plaidapp/search/domain/LoadSearchDataUseCase.kt b/search/src/main/java/io/plaidapp/search/domain/LoadSearchDataUseCase.kt
@@ -22,6 +22,12 @@ import io.plaidapp.core.data.PlaidItem
 import io.plaidapp.core.data.Result
 import io.plaidapp.core.interfaces.SearchDataSourceFactory
 import io.plaidapp.core.ui.getPlaidItemsForDisplay
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.async
+import kotlin.coroutines.coroutineContext
 
 /**
  * Searches for a query in a list of data sources. Exposes the results of the search in a LiveData,
@@ -40,13 +46,20 @@ class LoadSearchDataUseCase(
         get() = _searchResult
 
     suspend operator fun invoke() {
+        val job = SupervisorJob(coroutineContext[Job])
+        val scope = CoroutineScope(job)
+        val deferredJobs = mutableListOf<Deferred<Unit>>()
+
         dataSources.forEach {
-            val result = it.loadMore()
-            if (result is Result.Success) {
-                val oldItems = _searchResult.value.orEmpty().toMutableList()
-                val searchResult = getPlaidItemsForDisplay(oldItems, result.data)
-                _searchResult.postValue(searchResult)
-            }
+            deferredJobs.add(scope.async {
+                val result = it.loadMore()
+                if (result is Result.Success) {
+                    val oldItems = _searchResult.value.orEmpty().toMutableList()
+                    val searchResult = getPlaidItemsForDisplay(oldItems, result.data)
+                    _searchResult.postValue(searchResult)
+                }
+            })
         }
+        deferredJobs.forEach { it.await() }
     }
 }
diff --git a/search/src/main/java/io/plaidapp/search/domain/SearchDataSourceFactoriesRegistry.kt b/search/src/main/java/io/plaidapp/search/domain/SearchDataSourceFactoriesRegistry.kt
@@ -34,12 +34,4 @@ class SearchDataSourceFactoriesRegistry @Inject constructor(
 
     val dataSourceFactories: Set<SearchDataSourceFactory>
         get() = _dataSourceFactories
-
-    fun add(dataSourceFactory: SearchDataSourceFactory) {
-        _dataSourceFactories.add(dataSourceFactory)
-    }
-
-    fun remove(dataSourceFactory: SearchDataSourceFactory) {
-        _dataSourceFactories.remove(dataSourceFactory)
-    }
 }
diff --git a/search/src/main/java/io/plaidapp/search/ui/SearchViewModel.kt b/search/src/main/java/io/plaidapp/search/ui/SearchViewModel.kt
@@ -58,7 +58,7 @@ class SearchViewModel(
         get() = _searchProgress
 
     fun searchFor(query: String) {
-        searchQuery.postValue(query)
+        searchQuery.value = query
     }
 
     fun loadMore() = viewModelScope.launch(dispatcherProvider.computation) {