Reduce memory footprint of Hilt (#159)

* Remove @singleton where it is not needed * Use @AssistedFactory where possible
kirmanak · Jul 4, 2023 · 2375be0 · 2375be0
1 parent 2bc2bb7
commit 2375be0
Show file tree

Hide file tree

Showing 55 changed files with 51 additions and 215 deletions.
diff --git a/app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt
@@ -10,9 +10,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class AddRecipeRepoImpl @Inject constructor(
     private val addRecipeDataSource: AddRecipeDataSource,
     private val addRecipeStorage: AddRecipeStorage,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt
@@ -8,9 +8,7 @@ import gq.kirmanak.mealient.datasource.v0.models.CreateApiTokenRequestV0
 import gq.kirmanak.mealient.datasource.v1.MealieDataSourceV1
 import gq.kirmanak.mealient.datasource.v1.models.CreateApiTokenRequestV1
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class AuthDataSourceImpl @Inject constructor(
     private val serverInfoRepo: ServerInfoRepo,
     private val v0Source: MealieDataSourceV0,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt
@@ -8,9 +8,7 @@ import gq.kirmanak.mealient.logging.Logger
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class AuthRepoImpl @Inject constructor(
     private val authStorage: AuthStorage,
     private val authDataSource: AuthDataSource,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoImpl.kt
@@ -7,9 +7,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class ServerInfoRepoImpl @Inject constructor(
     private val serverInfoStorage: ServerInfoStorage,
     private val versionDataSource: VersionDataSource,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt
@@ -9,9 +9,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class VersionDataSourceImpl @Inject constructor(
     private val v0Source: MealieDataSourceV0,
     private val v1Source: MealieDataSourceV1,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/ServerInfoStorageImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/ServerInfoStorageImpl.kt
@@ -5,9 +5,7 @@ import gq.kirmanak.mealient.data.baseurl.ServerInfoStorage
 import gq.kirmanak.mealient.data.storage.PreferencesStorage
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class ServerInfoStorageImpl @Inject constructor(
     private val preferencesStorage: PreferencesStorage,
 ) : ServerInfoStorage {

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/configuration/BuildConfigurationImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/configuration/BuildConfigurationImpl.kt
@@ -3,17 +3,10 @@ package gq.kirmanak.mealient.data.configuration
 import gq.kirmanak.mealient.BuildConfig
 import gq.kirmanak.mealient.architecture.configuration.BuildConfiguration
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class BuildConfigurationImpl @Inject constructor() : BuildConfiguration {
 
-    @get:JvmName("_isDebug")
-    private val isDebug by lazy { BuildConfig.DEBUG }
+    override fun isDebug(): Boolean = BuildConfig.DEBUG
 
-    private val versionCode by lazy { BuildConfig.VERSION_CODE }
-
-    override fun isDebug(): Boolean = isDebug
-
-    override fun versionCode(): Int = versionCode
+    override fun versionCode(): Int = BuildConfig.VERSION_CODE
 }
diff --git a/app/src/main/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImpl.kt
@@ -6,9 +6,7 @@ import gq.kirmanak.mealient.logging.Logger
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class DisclaimerStorageImpl @Inject constructor(
     private val preferencesStorage: PreferencesStorage,
     private val logger: Logger,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/migration/From24AuthMigrationExecutor.kt b/app/src/main/java/gq/kirmanak/mealient/data/migration/From24AuthMigrationExecutor.kt
@@ -8,9 +8,7 @@ import gq.kirmanak.mealient.datastore.DataStoreModule.Companion.ENCRYPTED
 import gq.kirmanak.mealient.logging.Logger
 import javax.inject.Inject
 import javax.inject.Named
-import javax.inject.Singleton
 
-@Singleton
 class From24AuthMigrationExecutor @Inject constructor(
     @Named(ENCRYPTED) private val sharedPreferences: SharedPreferences,
     private val authRepo: AuthRepo,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationDetectorImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationDetectorImpl.kt
@@ -5,17 +5,14 @@ import gq.kirmanak.mealient.data.storage.PreferencesStorage
 import gq.kirmanak.mealient.datasource.runCatchingExceptCancel
 import gq.kirmanak.mealient.logging.Logger
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class MigrationDetectorImpl @Inject constructor(
     private val preferencesStorage: PreferencesStorage,
     private val migrationExecutors: Set<@JvmSuppressWildcards MigrationExecutor>,
     private val buildConfiguration: BuildConfiguration,
     private val logger: Logger,
 ) : MigrationDetector {
 
-
     override suspend fun executeMigrations() {
         val key = preferencesStorage.lastExecutedMigrationVersionKey
 

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt b/app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt
@@ -13,9 +13,7 @@ import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0
 import gq.kirmanak.mealient.datasource.v1.MealieDataSourceV1
 import gq.kirmanak.mealient.model_mapper.ModelMapper
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class MealieDataSourceWrapper @Inject constructor(
     private val serverInfoRepo: ServerInfoRepo,
     private val v0Source: MealieDataSourceV0,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProviderImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProviderImpl.kt
@@ -4,9 +4,7 @@ import gq.kirmanak.mealient.data.baseurl.ServerInfoRepo
 import gq.kirmanak.mealient.logging.Logger
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class RecipeImageUrlProviderImpl @Inject constructor(
     private val serverInfoRepo: ServerInfoRepo,
     private val logger: Logger,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt
@@ -12,10 +12,8 @@ import gq.kirmanak.mealient.datasource.runCatchingExceptCancel
 import gq.kirmanak.mealient.logging.Logger
 import gq.kirmanak.mealient.model_mapper.ModelMapper
 import javax.inject.Inject
-import javax.inject.Singleton
 
 @OptIn(ExperimentalPagingApi::class)
-@Singleton
 class RecipeRepoImpl @Inject constructor(
     private val mediator: RecipesRemoteMediator,
     private val storage: RecipeStorage,

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/share/ShareRecipeRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/share/ShareRecipeRepoImpl.kt
@@ -4,9 +4,7 @@ import androidx.core.util.PatternsCompat
 import gq.kirmanak.mealient.datasource.models.ParseRecipeURLInfo
 import gq.kirmanak.mealient.logging.Logger
 import javax.inject.Inject
-import javax.inject.Singleton
 
-@Singleton
 class ShareRecipeRepoImpl @Inject constructor(
     private val logger: Logger,
     private val parseRecipeDataSource: ParseRecipeDataSource,

diff --git a/app/src/main/java/gq/kirmanak/mealient/di/AddRecipeModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/AddRecipeModule.kt
@@ -10,22 +10,18 @@ import gq.kirmanak.mealient.data.add.impl.AddRecipeRepoImpl
 import gq.kirmanak.mealient.data.network.MealieDataSourceWrapper
 import gq.kirmanak.mealient.datastore.recipe.AddRecipeStorage
 import gq.kirmanak.mealient.datastore.recipe.AddRecipeStorageImpl
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface AddRecipeModule {
 
 
     @Binds
-    @Singleton
     fun provideAddRecipeRepo(repo: AddRecipeRepoImpl): AddRecipeRepo
 
     @Binds
-    @Singleton
     fun bindAddRecipeDataSource(mealieDataSourceWrapper: MealieDataSourceWrapper): AddRecipeDataSource
 
     @Binds
-    @Singleton
     fun bindAddRecipeStorage(addRecipeStorageImpl: AddRecipeStorageImpl): AddRecipeStorage
 }
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/AppModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/AppModule.kt
@@ -27,6 +27,5 @@ interface AppModule {
     }
 
     @Binds
-    @Singleton
     fun bindPreferencesStorage(preferencesStorage: PreferencesStorageImpl): PreferencesStorage
 }
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/ArchitectureModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/ArchitectureModule.kt
@@ -6,13 +6,11 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import gq.kirmanak.mealient.architecture.configuration.BuildConfiguration
 import gq.kirmanak.mealient.data.configuration.BuildConfigurationImpl
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface ArchitectureModule {
 
     @Binds
-    @Singleton
     fun bindBuildConfiguration(buildConfigurationImpl: BuildConfigurationImpl): BuildConfiguration
 }
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt
@@ -1,12 +1,8 @@
 package gq.kirmanak.mealient.di
 
-import android.accounts.AccountManager
-import android.content.Context
 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 gq.kirmanak.mealient.data.auth.AuthDataSource
 import gq.kirmanak.mealient.data.auth.AuthRepo
@@ -16,38 +12,23 @@ import gq.kirmanak.mealient.data.auth.impl.AuthRepoImpl
 import gq.kirmanak.mealient.data.auth.impl.AuthStorageImpl
 import gq.kirmanak.mealient.datasource.AuthenticationProvider
 import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsAuthRepo
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface AuthModule {
 
-    companion object {
-
-        @Provides
-        @Singleton
-        fun provideAccountManager(@ApplicationContext context: Context): AccountManager {
-            return AccountManager.get(context)
-        }
-    }
-
     @Binds
-    @Singleton
     fun bindAuthDataSource(authDataSourceImpl: AuthDataSourceImpl): AuthDataSource
 
     @Binds
-    @Singleton
     fun bindAuthRepo(authRepo: AuthRepoImpl): AuthRepo
 
     @Binds
-    @Singleton
     fun bindAuthProvider(authRepo: AuthRepoImpl): AuthenticationProvider
 
     @Binds
-    @Singleton
     fun bindAuthStorage(authStorageImpl: AuthStorageImpl): AuthStorage
 
     @Binds
-    @Singleton
     fun bindShoppingListsAuthRepo(impl: AuthRepoImpl): ShoppingListsAuthRepo
 }
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt
@@ -7,25 +7,20 @@ import dagger.hilt.components.SingletonComponent
 import gq.kirmanak.mealient.data.baseurl.*
 import gq.kirmanak.mealient.data.baseurl.impl.ServerInfoStorageImpl
 import gq.kirmanak.mealient.datasource.ServerUrlProvider
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface BaseURLModule {
 
     @Binds
-    @Singleton
     fun bindVersionDataSource(versionDataSourceImpl: VersionDataSourceImpl): VersionDataSource
 
     @Binds
-    @Singleton
     fun bindBaseUrlStorage(baseURLStorageImpl: ServerInfoStorageImpl): ServerInfoStorage
 
     @Binds
-    @Singleton
     fun bindServerInfoRepo(serverInfoRepoImpl: ServerInfoRepoImpl): ServerInfoRepo
 
     @Binds
-    @Singleton
     fun bindServerUrlProvider(serverInfoRepoImpl: ServerInfoRepoImpl): ServerUrlProvider
 }
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/DisclaimerModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/DisclaimerModule.kt
@@ -6,13 +6,11 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage
 import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorageImpl
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface DisclaimerModule {
 
     @Binds
-    @Singleton
     fun provideDisclaimerStorage(disclaimerStorageImpl: DisclaimerStorageImpl): DisclaimerStorage
 }
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/MigrationModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/MigrationModule.kt
@@ -9,18 +9,15 @@ import gq.kirmanak.mealient.data.migration.From24AuthMigrationExecutor
 import gq.kirmanak.mealient.data.migration.MigrationDetector
 import gq.kirmanak.mealient.data.migration.MigrationDetectorImpl
 import gq.kirmanak.mealient.data.migration.MigrationExecutor
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface MigrationModule {
 
     @Binds
-    @Singleton
     @IntoSet
     fun bindFrom24AuthMigrationExecutor(from24AuthMigrationExecutor: From24AuthMigrationExecutor): MigrationExecutor
 
     @Binds
-    @Singleton
     fun bindMigrationDetector(migrationDetectorImpl: MigrationDetectorImpl): MigrationDetector
 }
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/RecipeModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/RecipeModule.kt
@@ -15,36 +15,29 @@ import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource
 import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity
 import gq.kirmanak.mealient.ui.recipes.images.RecipeModelLoaderFactory
 import java.io.InputStream
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface RecipeModule {
 
     @Binds
-    @Singleton
     fun provideRecipeDataSource(mealieDataSourceWrapper: MealieDataSourceWrapper): RecipeDataSource
 
     @Binds
-    @Singleton
     fun provideRecipeRepo(recipeRepoImpl: RecipeRepoImpl): RecipeRepo
 
     @Binds
-    @Singleton
     fun bindImageUrlProvider(recipeImageUrlProviderImpl: RecipeImageUrlProviderImpl): RecipeImageUrlProvider
 
     @Binds
-    @Singleton
     fun bindModelLoaderFactory(recipeModelLoaderFactory: RecipeModelLoaderFactory): ModelLoaderFactory<RecipeSummaryEntity, InputStream>
 
     @Binds
-    @Singleton
     fun bindRecipePagingSourceFactory(recipePagingSourceFactoryImpl: RecipePagingSourceFactoryImpl): RecipePagingSourceFactory
 
     companion object {
 
         @Provides
-        @Singleton
         fun provideGlideRequestOptions(): RequestOptions = RequestOptions.centerCropTransform()
             .placeholder(R.drawable.placeholder_recipe)
     }

diff --git a/app/src/main/java/gq/kirmanak/mealient/di/ShareRecipeModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/ShareRecipeModule.kt
@@ -8,17 +8,14 @@ import gq.kirmanak.mealient.data.network.MealieDataSourceWrapper
 import gq.kirmanak.mealient.data.share.ParseRecipeDataSource
 import gq.kirmanak.mealient.data.share.ShareRecipeRepo
 import gq.kirmanak.mealient.data.share.ShareRecipeRepoImpl
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface ShareRecipeModule {
 
     @Binds
-    @Singleton
     fun bindShareRecipeRepo(shareRecipeRepoImpl: ShareRecipeRepoImpl): ShareRecipeRepo
 
     @Binds
-    @Singleton
     fun bindParseRecipeDataSource(mealieDataSourceWrapper: MealieDataSourceWrapper): ParseRecipeDataSource
 }