Change signatures of provider functions in di package

Nanamare · Sep 9, 2023 · 02a7d0b · 02a7d0b
1 parent 5116fd6
commit 02a7d0b
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 28 deletions.
diff --git a/app/src/main/java/com/nanamare/movie/di/RemoteMovieModule.kt b/app/src/main/java/com/nanamare/movie/di/RemoteMovieModule.kt
@@ -3,6 +3,7 @@ package com.nanamare.movie.di
 import com.nanamare.data.source.remote.MovieApi
 import com.nanamare.data.source.remote.impl.MovieRemoteRepositoryImpl
 import com.nanamare.domain.repository.MovieRemoteRepository
+import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -20,9 +21,13 @@ class RemoteMovieModule {
     @Provides
     fun provideMovieApi(@Named("retrofit_tmdb") retrofit: Retrofit): MovieApi = retrofit.create()
 
-    @Singleton
-    @Provides
-    fun provideUpcomingMovieRepository(movieRemoteRepositoryImpl: MovieRemoteRepositoryImpl): MovieRemoteRepository =
-        movieRemoteRepositoryImpl
-
+    @InstallIn(SingletonComponent::class)
+    @Module
+    interface Binder {
+        @Singleton
+        @Binds
+        fun provideUpcomingMovieRepository(
+            movieRemoteRepositoryImpl: MovieRemoteRepositoryImpl
+        ): MovieRemoteRepository
+    }
 }
diff --git a/app/src/main/java/com/nanamare/movie/di/app/LogModule.kt b/app/src/main/java/com/nanamare/movie/di/app/LogModule.kt
@@ -15,5 +15,4 @@ interface LogModule {
     @Binds
     @Singleton
     fun provideLog(logImpl: LogImpl): Log
-
 }
diff --git a/app/src/main/java/com/nanamare/movie/di/app/NetworkModule.kt b/app/src/main/java/com/nanamare/movie/di/app/NetworkModule.kt
@@ -8,6 +8,7 @@ import com.nanamare.base.util.NetworkConnectionImpl
 import com.nanamare.data.BuildConfig
 import com.nanamare.data.source.remote.interceptor.AuthenticationInterceptor
 import com.nanamare.data.source.remote.interceptor.CacheInterceptor
+import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -29,6 +30,7 @@ import javax.inject.Singleton
 class NetworkModule {
 
     @Provides
+    @Singleton
     fun provideHttpClientBuilder() = OkHttpClient.Builder()
         .connectTimeout(TIME_OUT, TimeUnit.SECONDS)
         .readTimeout(TIME_OUT, TimeUnit.SECONDS)
@@ -76,10 +78,14 @@ class NetworkModule {
             .build()
     }
 
-    @Singleton
-    @Provides
-    fun provideNetworkConnection(@ApplicationContext context: Context): NetworkConnection =
-        NetworkConnectionImpl(context)
+
+    @InstallIn(SingletonComponent::class)
+    @Module
+    interface Binder {
+        @Binds
+        @Singleton
+        fun bindNetworkConnection(connection: NetworkConnectionImpl): NetworkConnection
+    }
 
     companion object {
         private const val TIME_OUT = 30L

diff --git a/app/src/main/java/com/nanamare/movie/di/app/ResourceModule.kt b/app/src/main/java/com/nanamare/movie/di/app/ResourceModule.kt
@@ -1,22 +1,18 @@
 package com.nanamare.movie.di.app
 
-import android.content.Context
 import com.nanamare.movie.provider.ResourceProvider
 import com.nanamare.movie.provider.ResourceProviderImpl
+import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)
 @Module
-class ResourceModule {
+abstract class ResourceModule {
 
     @Singleton
-    @Provides
-    fun provideResource(@ApplicationContext context: Context): ResourceProvider =
-        ResourceProviderImpl(context)
-
-}
+    @Binds
+    abstract fun provideResource(provider: ResourceProviderImpl): ResourceProvider
+}
diff --git a/app/src/main/java/com/nanamare/movie/di/app/ViewModelModule.kt b/app/src/main/java/com/nanamare/movie/di/app/ViewModelModule.kt
@@ -11,9 +11,7 @@ import dagger.hilt.android.scopes.ViewModelScoped
 @InstallIn(ViewModelComponent::class)
 @Module
 interface ViewModelModule {
-
+    @Binds
     @ViewModelScoped
-    @get:[Binds]
-    val NavigationViewModelImpl.bindNavigationViewModelImpl: NavigationViewModel
-
+    fun bindNavigationViewModelImpl(viewModelImpl: NavigationViewModelImpl): NavigationViewModel
 }
diff --git a/app/src/main/java/com/nanamare/movie/provider/ResourceProviderImpl.kt b/app/src/main/java/com/nanamare/movie/provider/ResourceProviderImpl.kt
@@ -1,9 +1,11 @@
 package com.nanamare.movie.provider
 
 import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
 
-class ResourceProviderImpl(private val context: Context) : ResourceProvider {
+class ResourceProviderImpl(
+    @ApplicationContext private val context: Context
+) : ResourceProvider {
 
     override fun getString(id: Int): String = context.getString(id)
-
-}
+}
diff --git a/data/src/main/java/com/nanamare/data/source/remote/impl/MovieRemoteRepositoryImpl.kt b/data/src/main/java/com/nanamare/data/source/remote/impl/MovieRemoteRepositoryImpl.kt
@@ -11,8 +11,9 @@ import com.nanamare.domain.usecase.SearchQuery
 import retrofit2.await
 import javax.inject.Inject
 
-class MovieRemoteRepositoryImpl @Inject constructor(private val movieApi: MovieApi) :
-    MovieRemoteRepository {
+class MovieRemoteRepositoryImpl @Inject constructor(
+    private val movieApi: MovieApi
+) : MovieRemoteRepository {
 
     override suspend fun getUpcomingMovie(page: Int): MovieResponseModel =
         movieApi.getUpcomingMovie(page).await().toDomainModel()
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,5 +15,4 @@ interface LogModule { @@
         @Binds
         @Singleton
         fun provideLog(logImpl: LogImpl): Log
     }