Switching to providing a list of factories, to enable more implementa…

…tions of SearchDataSourceFactory
WiiliamChik · Apr 16, 2019 · 9d01634 · 9d01634
1 parent f1dae3b
commit 9d01634
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/core/src/main/java/io/plaidapp/core/interfaces/SearchDataSourceFactoriesRegistry.kt b/core/src/main/java/io/plaidapp/core/interfaces/SearchDataSourceFactoriesRegistry.kt
@@ -20,12 +20,12 @@ import javax.inject.Inject
 import javax.inject.Provider
 
 class SearchDataSourceFactoriesRegistry @Inject constructor(
-    defaultFactory: Provider<SearchDataSourceFactory?>
+    defaultFactories: Provider<List<SearchDataSourceFactory>>
 ) {
     private val _dataSourceFactories = mutableListOf<SearchDataSourceFactory>()
 
     init {
-        defaultFactory.get()?.apply { add(this) }
+        defaultFactories.get()?.forEach { add(it) }
     }
 
     val dataSourceFactories: List<SearchDataSourceFactory>

diff --git a/search/src/main/java/io/plaidapp/search/dagger/SearchComponent.kt b/search/src/main/java/io/plaidapp/search/dagger/SearchComponent.kt
@@ -31,7 +31,7 @@ import io.plaidapp.search.ui.SearchActivity
 @FeatureScope
 interface SearchComponent : BaseActivityComponent<SearchActivity> {
 
-    fun factory(): SearchDataSourceFactory?
+    fun factories(): List<SearchDataSourceFactory>
 
     @Component.Builder
     interface Builder {

diff --git a/search/src/main/java/io/plaidapp/search/dagger/SearchModule.kt b/search/src/main/java/io/plaidapp/search/dagger/SearchModule.kt
@@ -65,15 +65,21 @@ abstract class SearchModule {
 
         @JvmStatic
         @Provides
-        fun factory(activity: Activity): SearchDataSourceFactory? {
+        fun factories(activity: Activity): List<SearchDataSourceFactory> {
+            val factories = mutableListOf<SearchDataSourceFactory>()
             try {
                 val provider = Class
                     .forName("io.plaidapp.designernews.domain.search.DesignerNewsSearchFactoryProvider")
                     .kotlin.objectInstance as SearchFactoryProvider
-                return provider.getFactory(activity.applicationContext)
+                val factory = provider.getFactory(activity.applicationContext)
+                factory?.apply {
+                    factories.add(this)
+                }
             } catch (e: ClassNotFoundException) {
-                return null
+                // nothing to do
             }
+
+            return factories
         }
 
         @JvmStatic