From 1d63cb4d40244b8741df501e12fde7eb0b8e4f09 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Tue, 15 Nov 2022 20:50:12 +0100 Subject: [PATCH] Add missing binding in NetworkModule --- .../apps/nowinandroid/core/data/di/DataModule.kt | 13 ------------- .../nowinandroid/core/network/di/NetworkModule.kt | 9 +++++++++ .../nowinandroid/core/network/di/NetworkModule.kt | 9 +++++++++ .../nowinandroid/core/network/di/NetworkModule.kt | 9 +++++++++ 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt index a0cc51001..8f66787f3 100644 --- a/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt +++ b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt @@ -16,7 +16,6 @@ package com.google.samples.apps.nowinandroid.core.data.di -import android.content.Context import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository import com.google.samples.apps.nowinandroid.core.data.repository.OfflineFirstAuthorsRepository @@ -27,27 +26,15 @@ import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositor import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository import com.google.samples.apps.nowinandroid.core.data.util.ConnectivityManagerNetworkMonitor import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor -import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager 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 @Module @InstallIn(SingletonComponent::class) interface DataModule { - companion object { - @Provides - @Singleton - fun providesFakeAssetManager( - @ApplicationContext context: Context - ): FakeAssetManager = FakeAssetManager(context.assets::open) - } - @Binds fun bindsTopicRepository( topicsRepository: OfflineFirstTopicsRepository diff --git a/core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt index 2b906063c..504d634af 100644 --- a/core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt +++ b/core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt @@ -16,11 +16,14 @@ package com.google.samples.apps.nowinandroid.core.network.di +import android.content.Context import com.google.samples.apps.nowinandroid.core.network.NiANetwork +import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiANetwork import dagger.Binds import dagger.Module import dagger.Provides +import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import javax.inject.Singleton @@ -41,5 +44,11 @@ interface NetworkModule { fun providesNetworkJson(): Json = Json { ignoreUnknownKeys = true } + + @Provides + @Singleton + fun providesFakeAssetManager( + @ApplicationContext context: Context + ): FakeAssetManager = FakeAssetManager(context.assets::open) } } diff --git a/core/network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core/network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt index 4689fdbe2..c8b3a3208 100644 --- a/core/network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt +++ b/core/network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt @@ -16,12 +16,15 @@ package com.google.samples.apps.nowinandroid.core.network.di +import android.content.Context import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource +import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkDataSource 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 import kotlinx.serialization.json.Json @@ -41,5 +44,11 @@ interface NetworkModule { fun providesNetworkJson(): Json = Json { ignoreUnknownKeys = true } + + @Provides + @Singleton + fun providesFakeAssetManager( + @ApplicationContext context: Context, + ): FakeAssetManager = FakeAssetManager(context.assets::open) } } diff --git a/core/network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core/network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt index 5a30a5761..15898b4e8 100644 --- a/core/network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt +++ b/core/network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt @@ -16,11 +16,14 @@ package com.google.samples.apps.nowinandroid.core.network.di +import android.content.Context +import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource import com.google.samples.apps.nowinandroid.core.network.retrofit.RetrofitNiaNetwork import dagger.Binds import dagger.Module import dagger.Provides +import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import javax.inject.Singleton @@ -41,5 +44,11 @@ interface NetworkModule { fun providesNetworkJson(): Json = Json { ignoreUnknownKeys = true } + + @Provides + @Singleton + fun providesFakeAssetManager( + @ApplicationContext context: Context, + ): FakeAssetManager = FakeAssetManager(context.assets::open) } }