Replace ServiceLocator by DI

app/src/main/java/com/otus/dihomework/ProductsApplication.kt

@@ -1,10 +1,21 @@
 package com.otus.dihomework
 
 import android.app.Application
+import com.otus.dihomework.common.di.Dependencies
+import com.otus.dihomework.common.di.DependenciesProvider
+import com.otus.dihomework.di.AppComponent
+import com.otus.dihomework.di.DaggerAppComponent
+
+class ProductsApplication : Application(), DependenciesProvider {
+
+    lateinit var appComponent: AppComponent
 
-class ProductsApplication : Application() {
     override fun onCreate() {
         super.onCreate()
-        ServiceLocator.init(this)
+        appComponent = DaggerAppComponent.factory().create(this)
+    }
+
+    override fun getDependencies(): Dependencies {
+        return appComponent
     }
 }

app/src/main/java/com/otus/dihomework/common/data/FavoritesRepositoryImpl.kt

@@ -9,10 +9,11 @@ import androidx.datastore.preferences.preferencesDataStore
 import com.otus.dihomework.common.domain_impl.FavoritesRepository
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import javax.inject.Inject
 
 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "favorites")
 
-class FavoritesRepositoryImpl(
+class FavoritesRepositoryImpl @Inject constructor(
     private val context: Context
 ) : FavoritesRepository {
 

app/src/main/java/com/otus/dihomework/common/data/ProductDomainMapper.kt

@@ -1,8 +1,9 @@
 package com.otus.dihomework.common.data
 
 import com.otus.dihomework.common.domain_api.Product
+import javax.inject.Inject
 
-class ProductDomainMapper() {
+class ProductDomainMapper @Inject constructor() {
 
     fun fromDto(dto: ProductDto): Product {
         return Product(

app/src/main/java/com/otus/dihomework/common/data/ProductRemoteDataSource.kt

@@ -1,12 +1,12 @@
 package com.otus.dihomework.common.data
 
-import com.otus.dihomework.ServiceLocator
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import javax.inject.Inject
 
-class ProductRemoteDataSource() {
-    private val apiService = ServiceLocator.getProductApiService()
-
+class ProductRemoteDataSource @Inject constructor(
+    private val apiService: ProductApiService
+) {
     fun consumeProducts(): Flow<List<ProductDto>> = flow {
         emit(apiService.getProducts())
     }

app/src/main/java/com/otus/dihomework/common/data/ProductRepositoryImpl.kt

@@ -1,15 +1,15 @@
 package com.otus.dihomework.common.data
 
-import com.otus.dihomework.ServiceLocator
 import com.otus.dihomework.common.domain_impl.ProductRepository
 import com.otus.dihomework.common.domain_api.Product
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import javax.inject.Inject
 
-class ProductRepositoryImpl() : ProductRepository {
-
-    private val remoteDataSource = ServiceLocator.getProductRemoteDataSource()
-    private val mapper = ServiceLocator.getProductDomainMapper()
+class ProductRepositoryImpl @Inject constructor(
+    private val remoteDataSource: ProductRemoteDataSource,
+    private val mapper: ProductDomainMapper
+) : ProductRepository {
 
     override fun consumeProducts(): Flow<List<Product>> {
         return remoteDataSource.consumeProducts()

app/src/main/java/com/otus/dihomework/common/domain_impl/ConsumeFavoritesUseCaseImpl.kt

@@ -1,15 +1,15 @@
 package com.otus.dihomework.common.domain_impl
 
-import com.otus.dihomework.ServiceLocator
 import com.otus.dihomework.common.domain_api.ConsumeFavoritesUseCase
 import com.otus.dihomework.common.domain_api.ProductWithFavorite
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
+import javax.inject.Inject
 
-class ConsumeFavoritesUseCaseImpl() : ConsumeFavoritesUseCase {
-
-    private val productRepository = ServiceLocator.getProductRepository()
-    private val favoritesRepository = ServiceLocator.getFavoritesRepository()
+class ConsumeFavoritesUseCaseImpl @Inject constructor(
+    private val productRepository: ProductRepository,
+    private val favoritesRepository: FavoritesRepository
+) : ConsumeFavoritesUseCase {
 
     override fun invoke(): Flow<List<ProductWithFavorite>> {
         return combine(

app/src/main/java/com/otus/dihomework/common/domain_impl/ConsumeProductsUseCaseImpl.kt

@@ -1,16 +1,16 @@
 package com.otus.dihomework.common.domain_impl
 
-import com.otus.dihomework.ServiceLocator
 import com.otus.dihomework.common.domain_api.ConsumeProductsUseCase
 import com.otus.dihomework.common.domain_api.ProductWithFavorite
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
+import javax.inject.Inject
 
-class ConsumeProductsUseCaseImpl() : ConsumeProductsUseCase {
-
-    private val productRepository = ServiceLocator.getProductRepository()
-    private val favoritesRepository = ServiceLocator.getFavoritesRepository()
+class ConsumeProductsUseCaseImpl @Inject constructor(
+    private val productRepository: ProductRepository,
+    private val favoritesRepository: FavoritesRepository
+) : ConsumeProductsUseCase {
 
     override fun invoke(): Flow<List<ProductWithFavorite>> {
         return combine(

app/src/main/java/com/otus/dihomework/common/domain_impl/ToggleFavoriteUseCaseImpl.kt

@@ -1,11 +1,11 @@
 package com.otus.dihomework.common.domain_impl
 
-import com.otus.dihomework.ServiceLocator
 import com.otus.dihomework.common.domain_api.ToggleFavoriteUseCase
+import javax.inject.Inject
 
-class ToggleFavoriteUseCaseImpl() : ToggleFavoriteUseCase {
-
-    private val favoritesRepository = ServiceLocator.getFavoritesRepository()
+class ToggleFavoriteUseCaseImpl @Inject constructor(
+    private val favoritesRepository: FavoritesRepository
+) : ToggleFavoriteUseCase {
 
     override suspend fun invoke(productId: String, isFavorite: Boolean) {
         if (isFavorite) {

app/src/main/java/com/otus/dihomework/common/util/PriceFormatter.kt

@@ -1,6 +1,8 @@
 package com.otus.dihomework.common.util
 
-class PriceFormatter() {
+import javax.inject.Inject
+
+class PriceFormatter @Inject constructor() {
 
     fun format(price: Double): String {
         return "${price.toInt()} ₽"

app/src/main/java/com/otus/dihomework/di/AppComponent.kt

@@ -0,0 +1,28 @@
+package com.otus.dihomework.di
+
+import android.content.Context
+import com.otus.dihomework.common.domain_api.ConsumeProductsUseCase
+import com.otus.dihomework.common.domain_api.ToggleFavoriteUseCase
+import com.otus.dihomework.features.products.ProductsStateFactory
+import dagger.BindsInstance
+import dagger.Component
+import javax.inject.Singleton
+
+@Singleton
+@Component(modules = [NetworkModule::class, AppModule::class, SubcomponentsModule::class])
+interface AppComponent : ProductsDependencies {
+
+    fun favoritesComponent(): FavoritesComponent.Factory
+
+    @Component.Factory
+    interface Factory {
+        fun create(@BindsInstance context: Context): AppComponent
+    }
+
+    override fun consumeProductsUseCase(): ConsumeProductsUseCase
+    override fun toggleFavoriteUseCase(): ToggleFavoriteUseCase
+    override fun productsStateFactory(): ProductsStateFactory
+}
+
+@dagger.Module(subcomponents = [FavoritesComponent::class])
+interface SubcomponentsModule

app/src/main/java/com/otus/dihomework/di/AppModule.kt

@@ -0,0 +1,33 @@
+package com.otus.dihomework.di
+
+import com.otus.dihomework.common.data.FavoritesRepositoryImpl
+import com.otus.dihomework.common.data.ProductRepositoryImpl
+import com.otus.dihomework.common.domain_api.ConsumeFavoritesUseCase
+import com.otus.dihomework.common.domain_api.ConsumeProductsUseCase
+import com.otus.dihomework.common.domain_api.ToggleFavoriteUseCase
+import com.otus.dihomework.common.domain_impl.ConsumeFavoritesUseCaseImpl
+import com.otus.dihomework.common.domain_impl.ConsumeProductsUseCaseImpl
+import com.otus.dihomework.common.domain_impl.FavoritesRepository
+import com.otus.dihomework.common.domain_impl.ProductRepository
+import com.otus.dihomework.common.domain_impl.ToggleFavoriteUseCaseImpl
+import dagger.Binds
+import dagger.Module
+
+@Module
+interface AppModule {
+
+    @Binds
+    fun bindProductRepository(impl: ProductRepositoryImpl): ProductRepository
+
+    @Binds
+    fun bindFavoritesRepository(impl: FavoritesRepositoryImpl): FavoritesRepository
+
+    @Binds
+    fun bindConsumeProductsUseCase(impl: ConsumeProductsUseCaseImpl): ConsumeProductsUseCase
+
+    @Binds
+    fun bindConsumeFavoritesUseCase(impl: ConsumeFavoritesUseCaseImpl): ConsumeFavoritesUseCase
+
+    @Binds
+    fun bindToggleFavoriteUseCase(impl: ToggleFavoriteUseCaseImpl): ToggleFavoriteUseCase
+}

app/src/main/java/com/otus/dihomework/di/FavoritesComponent.kt

@@ -0,0 +1,16 @@
+package com.otus.dihomework.di
+
+import com.otus.dihomework.common.di.FeatureScope
+import com.otus.dihomework.features.favorites.FavoritesViewModelFactory
+import dagger.Subcomponent
+
+@FeatureScope
+@Subcomponent
+interface FavoritesComponent {
+    fun viewModelFactory(): FavoritesViewModelFactory
+
+    @Subcomponent.Factory
+    interface Factory {
+        fun create(): FavoritesComponent
+    }
+}

app/src/main/java/com/otus/dihomework/di/FavoritesDependencies.kt

@@ -0,0 +1,12 @@
+package com.otus.dihomework.di
+
+import com.otus.dihomework.common.di.Dependencies
+import com.otus.dihomework.common.domain_api.ConsumeFavoritesUseCase
+import com.otus.dihomework.common.domain_api.ToggleFavoriteUseCase
+import com.otus.dihomework.features.favorites.FavoritesStateFactory
+
+interface FavoritesDependencies : Dependencies {
+    fun consumeFavoritesUseCase(): ConsumeFavoritesUseCase
+    fun toggleFavoriteUseCase(): ToggleFavoriteUseCase
+    fun favoritesStateFactory(): FavoritesStateFactory
+}