A fully functional Android app built entirely with Kotlin and Jetpack Compose
Refactor `:core:network` DI
Simon Marquisee8eac34b8c6
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/FlavoredNetworkModule.ktsimilarity index 58%rename from core/network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktrename to core/network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.ktindex c8b3a3208..ee8534c10 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/FlavoredNetworkModule.kt@@ -16,39 +16,17 @@package com.google.samples.apps.nowinandroid.core.network.di-import android.content.Contextimport com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource-import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManagerimport com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkDataSourceimport dagger.Bindsimport dagger.Module-import dagger.Providesimport dagger.hilt.InstallIn-import dagger.hilt.android.qualifiers.ApplicationContextimport dagger.hilt.components.SingletonComponent-import javax.inject.Singleton-import kotlinx.serialization.json.Json@Module@InstallIn(SingletonComponent::class)-interface NetworkModule {+interface FlavoredNetworkModule {@Binds- fun bindsNiaNetwork(- niANetwork: FakeNiaNetworkDataSource- ): NiaNetworkDataSource-- companion object {- @Provides- @Singleton- fun providesNetworkJson(): Json = Json {- ignoreUnknownKeys = true- }-- @Provides- @Singleton- fun providesFakeAssetManager(- @ApplicationContext context: Context,- ): FakeAssetManager = FakeAssetManager(context.assets::open)- }+ fun FakeNiaNetworkDataSource.binds(): NiaNetworkDataSource}diff --git a/core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktsimilarity index 63%rename from core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktindex 504d634af..d6b6b987d 100644--- a/core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt+++ b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt@@ -17,38 +17,28 @@package com.google.samples.apps.nowinandroid.core.network.diimport android.content.Context-import com.google.samples.apps.nowinandroid.core.network.NiANetworkimport com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManager-import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiANetwork-import dagger.Bindsimport dagger.Moduleimport dagger.Provides-import dagger.hilt.android.qualifiers.ApplicationContextimport dagger.hilt.InstallIn+import dagger.hilt.android.qualifiers.ApplicationContextimport dagger.hilt.components.SingletonComponentimport javax.inject.Singletonimport kotlinx.serialization.json.Json@Module@InstallIn(SingletonComponent::class)-interface NetworkModule {-- @Binds- fun bindsNiANetwork(- niANetwork: FakeNiANetwork- ): NiANetwork+object NetworkModule {- companion object {- @Provides- @Singleton- fun providesNetworkJson(): Json = Json {- ignoreUnknownKeys = true- }-- @Provides- @Singleton- fun providesFakeAssetManager(- @ApplicationContext context: Context- ): FakeAssetManager = FakeAssetManager(context.assets::open)+ @Provides+ @Singleton+ 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/FlavoredNetworkModule.ktsimilarity index 58%rename from core/network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktrename to core/network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.ktindex 15898b4e8..ab463e99c 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/FlavoredNetworkModule.kt@@ -16,39 +16,17 @@package com.google.samples.apps.nowinandroid.core.network.di-import android.content.Context-import com.google.samples.apps.nowinandroid.core.network.fake.FakeAssetManagerimport com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSourceimport com.google.samples.apps.nowinandroid.core.network.retrofit.RetrofitNiaNetworkimport dagger.Bindsimport dagger.Module-import dagger.Provides-import dagger.hilt.android.qualifiers.ApplicationContextimport dagger.hilt.InstallInimport dagger.hilt.components.SingletonComponent-import javax.inject.Singleton-import kotlinx.serialization.json.Json@Module@InstallIn(SingletonComponent::class)-interface NetworkModule {+interface FlavoredNetworkModule {@Binds- fun bindsNiaNetwork(- niANetwork: RetrofitNiaNetwork- ): NiaNetworkDataSource-- companion object {- @Provides- @Singleton- fun providesNetworkJson(): Json = Json {- ignoreUnknownKeys = true- }-- @Provides- @Singleton- fun providesFakeAssetManager(- @ApplicationContext context: Context,- ): FakeAssetManager = FakeAssetManager(context.assets::open)- }+ fun RetrofitNiaNetwork.binds(): NiaNetworkDataSource}