Post dagger cleanup

* Remove unused params
* @Inject into FilterAdapter
* Introduce DesignerNewsPreferencesModule
* Fix CoroutinesContextProvider deprecations

app/src/main/java/io/plaidapp/dagger/Injector.kt

@@ -37,7 +37,7 @@ fun inject(
 ) {
     DaggerHomeComponent.builder()
         .coreComponent(PlaidApplication.coreComponent(activity))
-        .dataManagerModule(DataManagerModule(activity))
+        .dataManagerModule(DataManagerModule())
         .dataLoadedModule(OnDataLoadedModule(dataLoadedCallback))
         .filterAdapterModule(FilterAdapterModule(activity))
         .homeModule(HomeModule(activity))

core/src/main/java/io/plaidapp/core/dagger/CoreDataModule.kt

@@ -48,8 +48,6 @@ class CoreDataModule(private val baseUrl: String, private val factory: Converter
 
     @Provides
     fun provideRetrofit(
-        baseUrl: String,
-        factory: Converter.Factory,
         okHttpClient: OkHttpClient
     ): Retrofit {
         return Retrofit.Builder()

core/src/main/java/io/plaidapp/core/dagger/DataManagerModule.kt

@@ -16,7 +16,6 @@
 
 package io.plaidapp.core.dagger
 
-import android.content.Context
 import dagger.Module
 import dagger.Provides
 import io.plaidapp.core.dagger.dribbble.DribbbleDataModule
@@ -33,7 +32,7 @@ import io.plaidapp.core.ui.FilterAdapter
  * Module to provide [DataManager].
  */
 @Module(includes = [DribbbleDataModule::class])
-class DataManagerModule(val context: Context) {
+class DataManagerModule {
 
     private lateinit var manager: DataManager
 

core/src/main/java/io/plaidapp/core/dagger/FilterAdapterModule.kt

@@ -28,7 +28,5 @@ import io.plaidapp.core.ui.FilterAdapter
  */
 @Module class FilterAdapterModule(val context: Context) {
 
-    @Provides fun provideFilterAdapter() = FilterAdapter(context, provideSources())
-
     @Provides fun provideSources(): MutableList<Source> = SourceManager.getSources(context)
 }

core/src/main/java/io/plaidapp/core/dagger/SharedPreferencesModule.kt

@@ -24,7 +24,7 @@ import dagger.Provides
 /**
  * Provide [SharedPreferences] to this app's components.
  */
-@Module class SharedPreferencesModule(val context: Context, val name: String) {
+@Module open class SharedPreferencesModule(val context: Context, val name: String) {
 
     @Provides fun provideSharedPreferences(): SharedPreferences {
         return context.applicationContext.getSharedPreferences(name, Context.MODE_PRIVATE)

core/src/main/java/io/plaidapp/core/ui/FilterAdapter.kt

@@ -37,11 +37,12 @@ import io.plaidapp.core.util.AnimUtils
 import io.plaidapp.core.util.ColorUtils
 import io.plaidapp.core.util.ViewUtils
 import java.util.Collections
+import javax.inject.Inject
 
 /**
  * Adapter for showing the list of data sources used as filters for the home grid.
  */
-class FilterAdapter constructor(
+class FilterAdapter @Inject constructor(
     context: Context,
     val filters: MutableList<Source>
 ) : RecyclerView.Adapter<FilterViewHolder>(), FilterSwipeDismissListener {

designernews/src/main/java/io/plaidapp/designernews/dagger/DesignerNewsPreferencesModule.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2018 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.plaidapp.designernews.dagger
+
+import android.content.Context
+import dagger.Module
+import io.plaidapp.core.dagger.SharedPreferencesModule
+import io.plaidapp.core.designernews.data.login.LoginLocalDataSource
+
+@Module
+class DesignerNewsPreferencesModule(
+    context: Context
+) : SharedPreferencesModule(context, LoginLocalDataSource.DESIGNER_NEWS_PREF)

designernews/src/main/java/io/plaidapp/designernews/dagger/Injector.kt

@@ -24,9 +24,7 @@ import android.util.TypedValue
 import io.plaidapp.core.dagger.CoreDataModule
 import io.plaidapp.core.dagger.CoroutinesContextProviderModule
 import io.plaidapp.core.dagger.MarkdownModule
-import io.plaidapp.core.dagger.SharedPreferencesModule
 import io.plaidapp.core.designernews.data.api.DesignerNewsService
-import io.plaidapp.core.designernews.data.login.LoginLocalDataSource
 import io.plaidapp.designernews.ui.login.LoginActivity
 import io.plaidapp.designernews.ui.story.StoryActivity
 import io.plaidapp.ui.PlaidApplication
@@ -61,7 +59,7 @@ fun inject(storyId: Long, activity: StoryActivity) {
         .designerNewsModule(StoryModule(storyId, activity))
         .markdownModule(MarkdownModule(activity.resources.displayMetrics, bypassOptions))
         .sharedPreferencesModule(
-            SharedPreferencesModule(activity, LoginLocalDataSource.DESIGNER_NEWS_PREF)
+            DesignerNewsPreferencesModule(activity)
         )
         .build()
         .inject(activity)
@@ -72,7 +70,7 @@ fun inject(activity: LoginActivity) {
     DaggerLoginComponent.builder()
         .coreDataModule(coreDataModule)
         .sharedPreferencesModule(
-            SharedPreferencesModule(activity, LoginLocalDataSource.DESIGNER_NEWS_PREF)
+            DesignerNewsPreferencesModule(activity)
         )
         .build()
         .inject(activity)