Improve yield calculator integration

lneugebauer · Jul 15, 2024 · 497610d · 497610d
1 parent ee5cdfa
commit 497610d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/src/main/java/de/lukasneugebauer/nextcloudcookbook/di/RecipeModule.kt b/app/src/main/java/de/lukasneugebauer/nextcloudcookbook/di/RecipeModule.kt
@@ -8,9 +8,11 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import de.lukasneugebauer.nextcloudcookbook.core.util.IoDispatcher
+import de.lukasneugebauer.nextcloudcookbook.recipe.data.YieldCalculatorImpl
 import de.lukasneugebauer.nextcloudcookbook.recipe.data.dto.RecipeDto
 import de.lukasneugebauer.nextcloudcookbook.recipe.data.dto.RecipePreviewDto
 import de.lukasneugebauer.nextcloudcookbook.recipe.data.repository.RecipeRepositoryImpl
+import de.lukasneugebauer.nextcloudcookbook.recipe.domain.YieldCalculator
 import de.lukasneugebauer.nextcloudcookbook.recipe.domain.repository.RecipeRepository
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -85,4 +87,8 @@ object RecipeModule {
             recipePreviewsStore,
             recipeStore,
         )
+
+    @Provides
+    @Singleton
+    fun provideYieldCalculator(): YieldCalculator = YieldCalculatorImpl()
 }
diff --git a/.../de/lukasneugebauer/nextcloudcookbook/recipe/presentation/detail/RecipeDetailViewModel.kt b/.../de/lukasneugebauer/nextcloudcookbook/recipe/presentation/detail/RecipeDetailViewModel.kt
@@ -11,7 +11,7 @@ import de.lukasneugebauer.nextcloudcookbook.core.util.Resource
 import de.lukasneugebauer.nextcloudcookbook.core.util.UiText
 import de.lukasneugebauer.nextcloudcookbook.core.util.asUiText
 import de.lukasneugebauer.nextcloudcookbook.core.util.notZero
-import de.lukasneugebauer.nextcloudcookbook.recipe.data.YieldCalculatorImpl
+import de.lukasneugebauer.nextcloudcookbook.recipe.domain.YieldCalculator
 import de.lukasneugebauer.nextcloudcookbook.recipe.domain.repository.RecipeRepository
 import de.lukasneugebauer.nextcloudcookbook.recipe.domain.state.RecipeDetailState
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -27,6 +27,7 @@ class RecipeDetailViewModel
         private val preferencesManager: PreferencesManager,
         private val recipeRepository: RecipeRepository,
         savedStateHandle: SavedStateHandle,
+        private val yieldCalculator: YieldCalculator,
     ) : ViewModel() {
         private val _state = MutableStateFlow(RecipeDetailState())
         val state: StateFlow<RecipeDetailState> = _state
@@ -53,6 +54,12 @@ class RecipeDetailViewModel
                             val recipe = recipeResponse.value.toRecipe()
                             _state.value =
                                 _state.value.copy(
+                                    calculatedIngredients =
+                                        yieldCalculator.recalculateIngredients(
+                                            recipe.ingredients,
+                                            recipe.yield,
+                                            recipe.yield,
+                                        ),
                                     currentYield = recipe.yield,
                                     data = recipe,
                                     loading = false,
@@ -96,7 +103,6 @@ class RecipeDetailViewModel
 
         private fun recalculateYield(currentYield: Int) {
             val recipe = _state.value.data ?: return
-            val yieldCalculator = YieldCalculatorImpl()
             _state.value =
                 _state.value.copy(
                     calculatedIngredients =