From 2a3a7e32e765801fcab2a34e91f51911dac3e3a8 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Fri, 4 Nov 2022 20:45:43 +0100
Subject: [PATCH 01/11] Improve URL input screen

---
 app/src/main/res/layout/fragment_base_url.xml | 73 ++++++++++---------
 app/src/main/res/values-ru/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/app/src/main/res/layout/fragment_base_url.xml b/app/src/main/res/layout/fragment_base_url.xml
index 65ee007..3553b35 100644
--- a/app/src/main/res/layout/fragment_base_url.xml
+++ b/app/src/main/res/layout/fragment_base_url.xml
@@ -1,42 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.baseurl.BaseURLFragment">
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	tools:context=".ui.baseurl.BaseURLFragment">
 
-    <com.google.android.material.progressindicator.LinearProgressIndicator
-        android:id="@+id/progress"
-        style="@style/IndeterminateProgress"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+	<com.google.android.material.progressindicator.LinearProgressIndicator
+		android:id="@+id/progress"
+		style="@style/IndeterminateProgress"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:visibility="visible" />
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/url_input_layout"
-        style="@style/SmallMarginTextInputLayoutStyle"
-        android:hint="@string/fragment_authentication_input_hint_url"
-        app:layout_constraintBottom_toTopOf="@+id/button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed">
+	<com.google.android.material.textfield.TextInputLayout
+		android:id="@+id/url_input_layout"
+		style="@style/SmallMarginTextInputLayoutStyle"
+		android:hint="@string/fragment_authentication_input_hint_url"
+		app:helperText="@string/fragment_base_url_url_input_helper_text"
+		app:helperTextEnabled="true"
+		app:layout_constraintBottom_toTopOf="@+id/button"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_bias="0.2"
+		app:layout_constraintVertical_chainStyle="packed">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/url_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textUri" />
-    </com.google.android.material.textfield.TextInputLayout>
+		<com.google.android.material.textfield.TextInputEditText
+			android:id="@+id/url_input"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="textUri" />
+	</com.google.android.material.textfield.TextInputLayout>
 
-    <Button
-        android:id="@+id/button"
-        style="@style/SmallMarginButton"
-        android:text="@string/fragment_base_url_save"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/url_input_layout" />
+	<Button
+		android:id="@+id/button"
+		style="@style/SmallMarginButton"
+		android:text="@string/fragment_base_url_save"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/url_input_layout" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index bb3451e..3a9d83d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -38,4 +38,5 @@
 	<string name="fragment_add_recipe_save_error">Что-то пошло не так</string>
 	<string name="fragment_add_recipe_save_success">Рецепт сохранен успешно</string>
 	<string name="fragment_add_recipe_clear_button">Очистить</string>
+	<string name="fragment_base_url_url_input_helper_text">Пример: demo.mealie.io</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 793bcec..bb2911f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,4 +42,5 @@
 	<string name="fragment_add_recipe_save_error">Something went wrong</string>
 	<string name="fragment_add_recipe_save_success">Saved recipe successfully</string>
 	<string name="fragment_add_recipe_clear_button">Clear</string>
+	<string name="fragment_base_url_url_input_helper_text">Example: demo.mealie.io</string>
 </resources>
\ No newline at end of file

From e0780e9a9f48ce3c8be39741973b4bf33dd5d793 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Fri, 4 Nov 2022 20:52:09 +0100
Subject: [PATCH 02/11] Add login data examples

---
 .../res/layout/fragment_authentication.xml    | 30 +++++++++++--------
 app/src/main/res/values-ru/strings.xml        |  2 ++
 app/src/main/res/values/strings.xml           |  2 ++
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/layout/fragment_authentication.xml b/app/src/main/res/layout/fragment_authentication.xml
index 66cd7e7..2db484c 100644
--- a/app/src/main/res/layout/fragment_authentication.xml
+++ b/app/src/main/res/layout/fragment_authentication.xml
@@ -23,6 +23,8 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintVertical_bias="0.1"
+		app:helperText="@string/fragment_authentication_email_input_helper_text"
+		app:helperTextEnabled="true"
 		app:layout_constraintVertical_chainStyle="packed">
 
 		<com.google.android.material.textfield.TextInputEditText
@@ -33,20 +35,22 @@
 	</com.google.android.material.textfield.TextInputLayout>
 
 	<com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/password_input_layout"
-        style="@style/SmallMarginTextInputLayoutStyle"
-        android:hint="@string/fragment_authentication_input_hint_password"
-        app:layout_constraintBottom_toTopOf="@+id/button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:endIconMode="password_toggle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/email_input_layout">
+		android:id="@+id/password_input_layout"
+		style="@style/SmallMarginTextInputLayoutStyle"
+		android:hint="@string/fragment_authentication_input_hint_password"
+		app:layout_constraintBottom_toTopOf="@+id/button"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:endIconMode="password_toggle"
+		app:layout_constraintStart_toStartOf="parent"
+		app:helperText="@string/fragment_authentication_password_input_helper_text"
+		app:helperTextEnabled="true"
+		app:layout_constraintTop_toBottomOf="@+id/email_input_layout">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/password_input"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textPassword" />
+		<com.google.android.material.textfield.TextInputEditText
+			android:id="@+id/password_input"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:inputType="textPassword" />
 	</com.google.android.material.textfield.TextInputLayout>
 
     <Button
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3a9d83d..4bde1ed 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -39,4 +39,6 @@
 	<string name="fragment_add_recipe_save_success">Рецепт сохранен успешно</string>
 	<string name="fragment_add_recipe_clear_button">Очистить</string>
 	<string name="fragment_base_url_url_input_helper_text">Пример: demo.mealie.io</string>
+	<string name="fragment_authentication_email_input_helper_text">Пример: changeme@email.com</string>
+	<string name="fragment_authentication_password_input_helper_text">Пример: demo</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb2911f..c6b92fa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,4 +43,6 @@
 	<string name="fragment_add_recipe_save_success">Saved recipe successfully</string>
 	<string name="fragment_add_recipe_clear_button">Clear</string>
 	<string name="fragment_base_url_url_input_helper_text">Example: demo.mealie.io</string>
+	<string name="fragment_authentication_email_input_helper_text">Example: changeme@email.com</string>
+	<string name="fragment_authentication_password_input_helper_text">Example: demo</string>
 </resources>
\ No newline at end of file

From 714ff7d33f2f7056182db221726ffb6dc4b4cf2a Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Fri, 4 Nov 2022 21:30:52 +0100
Subject: [PATCH 03/11] Request recipes on successful authorization

---
 .../mealient/ui/recipes/RecipeViewModel.kt    | 29 ++++++++++++++++++-
 .../mealient/ui/recipes/RecipesFragment.kt    | 20 ++++++++++---
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
index b621488..998af6d 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
@@ -1,15 +1,42 @@
 package gq.kirmanak.mealient.ui.recipes
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.cachedIn
 import dagger.hilt.android.lifecycle.HiltViewModel
+import gq.kirmanak.mealient.data.auth.AuthRepo
 import gq.kirmanak.mealient.data.recipes.RecipeRepo
+import gq.kirmanak.mealient.logging.Logger
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.runningReduce
 import javax.inject.Inject
 
 @HiltViewModel
-class RecipeViewModel @Inject constructor(recipeRepo: RecipeRepo) : ViewModel() {
+class RecipeViewModel @Inject constructor(
+    recipeRepo: RecipeRepo,
+    authRepo: AuthRepo,
+    private val logger: Logger,
+) : ViewModel() {
 
     val pagingData = recipeRepo.createPager().flow.cachedIn(viewModelScope)
 
+    private val _isAuthorized = MutableLiveData<Boolean?>(null)
+    val isAuthorized: LiveData<Boolean?> = _isAuthorized
+
+    init {
+        authRepo.isAuthorizedFlow.runningReduce { wasAuthorized, isAuthorized ->
+            logger.v { "Authorization state changed from $wasAuthorized to $isAuthorized" }
+            if (wasAuthorized != isAuthorized) {
+                _isAuthorized.postValue(isAuthorized)
+            }
+            isAuthorized
+        }.launchIn(viewModelScope)
+    }
+
+    fun onAuthorizationChangeHandled() {
+        logger.v { "onAuthorizationSuccessHandled() called" }
+        _isAuthorized.postValue(null)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
index d775212..38e19d2 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
@@ -51,34 +51,46 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
         logger.v { "navigateToRecipeInfo() called with: recipeSummaryEntity = $recipeSummaryEntity" }
         findNavController().navigate(
             RecipesFragmentDirections.actionRecipesFragmentToRecipeInfoFragment(
-                recipeSlug = recipeSummaryEntity.slug,
-                recipeId = recipeSummaryEntity.remoteId
+                recipeSlug = recipeSummaryEntity.slug, recipeId = recipeSummaryEntity.remoteId
             )
         )
     }
 
     private fun setupRecipeAdapter() {
         logger.v { "setupRecipeAdapter() called" }
+
         val recipesAdapter = recipePagingAdapterFactory.build(
-            recipeImageLoader = recipeImageLoader,
-            clickListener = ::navigateToRecipeInfo
+            recipeImageLoader = recipeImageLoader, clickListener = ::navigateToRecipeInfo
         )
+
         with(binding.recipes) {
             adapter = recipesAdapter
             addOnScrollListener(recipePreloaderFactory.create(recipesAdapter))
         }
+
         collectWhenViewResumed(viewModel.pagingData) {
             logger.v { "setupRecipeAdapter: received data update" }
             recipesAdapter.submitData(lifecycle, it)
         }
+
         collectWhenViewResumed(recipesAdapter.onPagesUpdatedFlow) {
             logger.v { "setupRecipeAdapter: pages updated" }
             binding.refresher.isRefreshing = false
         }
+
         collectWhenViewResumed(binding.refresher.refreshRequestFlow(logger)) {
             logger.v { "setupRecipeAdapter: received refresh request" }
             recipesAdapter.refresh()
         }
+
+        viewModel.isAuthorized.observe(viewLifecycleOwner) { isAuthorized ->
+            logger.v { "setupRecipeAdapter: isAuthorized changed to $isAuthorized" }
+            if (isAuthorized != null) {
+                if (isAuthorized) recipesAdapter.refresh()
+                // else is ignored to avoid the removal of the non-public recipes
+                viewModel.onAuthorizationChangeHandled()
+            }
+        }
     }
 
     override fun onDestroyView() {

From 33bdaf9726967cc138760d3deff02cca23dc76b3 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Fri, 4 Nov 2022 22:13:57 +0100
Subject: [PATCH 04/11] Show load end/load failure toasts

---
 .../mealient/extensions/FragmentExtensions.kt |  8 ++-
 .../mealient/ui/recipes/RecipesFragment.kt    | 53 +++++++++++++++++++
 app/src/main/res/values-ru/strings.xml        |  6 +++
 app/src/main/res/values/strings.xml           |  6 +++
 4 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt b/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt
index dd4e678..69ca4c8 100644
--- a/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt
@@ -1,10 +1,12 @@
 package gq.kirmanak.mealient.extensions
 
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.launchIn
 
 fun <T> Fragment.collectWhenViewResumed(
     flow: Flow<T>,
@@ -13,4 +15,8 @@ fun <T> Fragment.collectWhenViewResumed(
 
 fun Fragment.launchWhenViewResumed(
     block: suspend CoroutineScope.() -> Unit,
-) = viewLifecycleOwner.lifecycleScope.launchWhenResumed(block)
\ No newline at end of file
+) = viewLifecycleOwner.lifecycleScope.launchWhenResumed(block)
+
+fun <T> Flow<T>.launchIn(lifecycleOwner: LifecycleOwner) {
+    launchIn(lifecycleOwner.lifecycleScope)
+}
\ No newline at end of file
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
index 38e19d2..280f325 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
@@ -2,21 +2,26 @@ package gq.kirmanak.mealient.ui.recipes
 
 import android.os.Bundle
 import android.view.View
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
+import androidx.paging.LoadState
 import by.kirich1409.viewbindingdelegate.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
 import gq.kirmanak.mealient.R
 import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity
 import gq.kirmanak.mealient.databinding.FragmentRecipesBinding
+import gq.kirmanak.mealient.datasource.NetworkError
 import gq.kirmanak.mealient.extensions.collectWhenViewResumed
+import gq.kirmanak.mealient.extensions.launchIn
 import gq.kirmanak.mealient.extensions.refreshRequestFlow
 import gq.kirmanak.mealient.logging.Logger
 import gq.kirmanak.mealient.ui.activity.MainActivityViewModel
 import gq.kirmanak.mealient.ui.recipes.images.RecipeImageLoader
 import gq.kirmanak.mealient.ui.recipes.images.RecipePreloaderFactory
+import kotlinx.coroutines.flow.*
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -78,6 +83,8 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
             binding.refresher.isRefreshing = false
         }
 
+        observeLoadStateChanges(recipesAdapter)
+
         collectWhenViewResumed(binding.refresher.refreshRequestFlow(logger)) {
             logger.v { "setupRecipeAdapter: received refresh request" }
             recipesAdapter.refresh()
@@ -93,6 +100,52 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
         }
     }
 
+    private fun observeLoadStateChanges(recipesAdapter: RecipesPagingAdapter) {
+        recipesAdapter.loadStateFlow
+            .map { it.append }
+            .distinctUntilChanged()
+            .filter { it.endOfPaginationReached }
+            .onEach { onPaginationEnd() }
+            .launchIn(viewLifecycleOwner)
+
+        recipesAdapter.loadStateFlow
+            .map { it.refresh }
+            .distinctUntilChanged()
+            .filterIsInstance<LoadState.Error>()
+            .onEach { onLoadFailure(it.error) }
+            .launchIn(viewLifecycleOwner)
+    }
+
+    private fun onPaginationEnd() {
+        logger.v { "onPaginationEnd() called" }
+        Toast.makeText(
+            requireContext(),
+            getString(R.string.fragment_recipes_last_page_loaded_toast),
+            Toast.LENGTH_SHORT
+        ).show()
+    }
+
+    private fun onLoadFailure(error: Throwable) {
+        logger.v(error) { "onLoadFailure() called" }
+
+        val reason = when (error) {
+            is NetworkError.Unauthorized -> R.string.fragment_recipes_load_failure_toast_unauthorized
+            is NetworkError.NoServerConnection -> R.string.fragment_recipes_load_failure_toast_no_connection
+            is NetworkError.NotMealie, is NetworkError.MalformedUrl -> R.string.fragment_recipes_load_failure_toast_unexpected_response
+            else -> null
+        }?.let { getString(it) }
+
+        val generalText = getString(R.string.fragment_recipes_load_failure_toast_general)
+
+        val text = if (reason == null) {
+            generalText
+        } else {
+            getString(R.string.fragment_recipes_load_failure_toast, generalText, reason)
+        }
+
+        Toast.makeText(requireContext(), text, Toast.LENGTH_SHORT).show()
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         logger.v { "onDestroyView() called" }
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4bde1ed..6d07ac4 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -41,4 +41,10 @@
 	<string name="fragment_base_url_url_input_helper_text">Пример: demo.mealie.io</string>
 	<string name="fragment_authentication_email_input_helper_text">Пример: changeme@email.com</string>
 	<string name="fragment_authentication_password_input_helper_text">Пример: demo</string>
+	<string name="fragment_recipes_last_page_loaded_toast">Последняя страница</string>
+	<string name="fragment_recipes_load_failure_toast">%1$s %2$s</string>
+	<string name="fragment_recipes_load_failure_toast_general">Ошибка загрузки.</string>
+	<string name="fragment_recipes_load_failure_toast_unauthorized">Неавторизован</string>
+	<string name="fragment_recipes_load_failure_toast_unexpected_response">Неожиданный ответ</string>
+	<string name="fragment_recipes_load_failure_toast_no_connection">Нет соединения</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c6b92fa..6a5c59e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,4 +45,10 @@
 	<string name="fragment_base_url_url_input_helper_text">Example: demo.mealie.io</string>
 	<string name="fragment_authentication_email_input_helper_text">Example: changeme@email.com</string>
 	<string name="fragment_authentication_password_input_helper_text">Example: demo</string>
+	<string name="fragment_recipes_last_page_loaded_toast">Last page loaded</string>
+	<string name="fragment_recipes_load_failure_toast" comment="EXAMPLE: Load failed! Unauthorized">%1$s %2$s</string>
+	<string name="fragment_recipes_load_failure_toast_general">Load failed.</string>
+	<string name="fragment_recipes_load_failure_toast_unauthorized">Unauthorized</string>
+	<string name="fragment_recipes_load_failure_toast_unexpected_response">Unexpected response</string>
+	<string name="fragment_recipes_load_failure_toast_no_connection">No connection</string>
 </resources>
\ No newline at end of file

From b7bb6c8566232ebaf32fb13e51d2297742c4972e Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sat, 5 Nov 2022 10:40:15 +0100
Subject: [PATCH 05/11] Simplify edge case handling

---
 .../mealient/extensions/FragmentExtensions.kt | 12 ++-
 .../mealient/ui/recipes/RecipesFragment.kt    | 76 ++++++++++---------
 app/src/main/res/values-ru/strings.xml        | 10 +--
 app/src/main/res/values/strings.xml           | 10 +--
 4 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt b/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt
index 69ca4c8..b6034cb 100644
--- a/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt
@@ -1,5 +1,7 @@
 package gq.kirmanak.mealient.extensions
 
+import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
@@ -19,4 +21,12 @@ fun Fragment.launchWhenViewResumed(
 
 fun <T> Flow<T>.launchIn(lifecycleOwner: LifecycleOwner) {
     launchIn(lifecycleOwner.lifecycleScope)
-}
\ No newline at end of file
+}
+
+fun Fragment.showLongToast(@StringRes text: Int) = showLongToast(getString(text))
+
+fun Fragment.showLongToast(text: String) = showToast(text, Toast.LENGTH_LONG)
+
+private fun Fragment.showToast(text: String, length: Int): Boolean {
+    return context?.let { Toast.makeText(it, text, length).show() } != null
+}
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
index 280f325..6981ae8 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
@@ -2,12 +2,14 @@ package gq.kirmanak.mealient.ui.recipes
 
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
+import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.paging.LoadState
+import androidx.paging.PagingDataAdapter
+import androidx.recyclerview.widget.RecyclerView
 import by.kirich1409.viewbindingdelegate.viewBinding
 import dagger.hilt.android.AndroidEntryPoint
 import gq.kirmanak.mealient.R
@@ -17,6 +19,7 @@ import gq.kirmanak.mealient.datasource.NetworkError
 import gq.kirmanak.mealient.extensions.collectWhenViewResumed
 import gq.kirmanak.mealient.extensions.launchIn
 import gq.kirmanak.mealient.extensions.refreshRequestFlow
+import gq.kirmanak.mealient.extensions.showLongToast
 import gq.kirmanak.mealient.logging.Logger
 import gq.kirmanak.mealient.ui.activity.MainActivityViewModel
 import gq.kirmanak.mealient.ui.recipes.images.RecipeImageLoader
@@ -83,7 +86,7 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
             binding.refresher.isRefreshing = false
         }
 
-        observeLoadStateChanges(recipesAdapter)
+        recipesAdapter.observeLoadStateChanges()
 
         collectWhenViewResumed(binding.refresher.refreshRequestFlow(logger)) {
             logger.v { "setupRecipeAdapter: received refresh request" }
@@ -100,50 +103,25 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
         }
     }
 
-    private fun observeLoadStateChanges(recipesAdapter: RecipesPagingAdapter) {
-        recipesAdapter.loadStateFlow
-            .map { it.append }
-            .distinctUntilChanged()
-            .filter { it.endOfPaginationReached }
-            .onEach { onPaginationEnd() }
-            .launchIn(viewLifecycleOwner)
-
-        recipesAdapter.loadStateFlow
-            .map { it.refresh }
-            .distinctUntilChanged()
-            .filterIsInstance<LoadState.Error>()
-            .onEach { onLoadFailure(it.error) }
-            .launchIn(viewLifecycleOwner)
+    private fun <T : Any, VH : RecyclerView.ViewHolder> PagingDataAdapter<T, VH>.observeLoadStateChanges() {
+        appendPaginationEnd().onEach { onPaginationEnd() }.launchIn(viewLifecycleOwner)
+        refreshErrors().onEach { onLoadFailure(it) }.launchIn(viewLifecycleOwner)
     }
 
     private fun onPaginationEnd() {
         logger.v { "onPaginationEnd() called" }
-        Toast.makeText(
-            requireContext(),
-            getString(R.string.fragment_recipes_last_page_loaded_toast),
-            Toast.LENGTH_SHORT
-        ).show()
+        showLongToast(R.string.fragment_recipes_last_page_loaded_toast)
     }
 
     private fun onLoadFailure(error: Throwable) {
-        logger.v(error) { "onLoadFailure() called" }
-
-        val reason = when (error) {
-            is NetworkError.Unauthorized -> R.string.fragment_recipes_load_failure_toast_unauthorized
-            is NetworkError.NoServerConnection -> R.string.fragment_recipes_load_failure_toast_no_connection
-            is NetworkError.NotMealie, is NetworkError.MalformedUrl -> R.string.fragment_recipes_load_failure_toast_unexpected_response
-            else -> null
-        }?.let { getString(it) }
-
-        val generalText = getString(R.string.fragment_recipes_load_failure_toast_general)
-
-        val text = if (reason == null) {
-            generalText
+        logger.w(error) { "onLoadFailure() called" }
+        val reason = error.toLoadErrorReasonText()?.let { getString(it) }
+        val toastText = if (reason == null) {
+            getString(R.string.fragment_recipes_load_failure_toast_no_reason)
         } else {
-            getString(R.string.fragment_recipes_load_failure_toast, generalText, reason)
+            getString(R.string.fragment_recipes_load_failure_toast, reason)
         }
-
-        Toast.makeText(requireContext(), text, Toast.LENGTH_SHORT).show()
+        showLongToast(toastText)
     }
 
     override fun onDestroyView() {
@@ -152,4 +130,28 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
         // Prevent RV leaking through mObservers list in adapter
         binding.recipes.adapter = null
     }
+}
+
+@StringRes
+private fun Throwable.toLoadErrorReasonText(): Int? = when (this) {
+    is NetworkError.Unauthorized -> R.string.fragment_recipes_load_failure_toast_unauthorized
+    is NetworkError.NoServerConnection -> R.string.fragment_recipes_load_failure_toast_no_connection
+    is NetworkError.NotMealie, is NetworkError.MalformedUrl -> R.string.fragment_recipes_load_failure_toast_unexpected_response
+    else -> null
+}
+
+private fun <T : Any, VH : RecyclerView.ViewHolder> PagingDataAdapter<T, VH>.refreshErrors(): Flow<Throwable> {
+    return loadStateFlow
+        .map { it.refresh }
+        .distinctUntilChanged()
+        .filterIsInstance<LoadState.Error>()
+        .map { it.error }
+}
+
+private fun <T : Any, VH : RecyclerView.ViewHolder> PagingDataAdapter<T, VH>.appendPaginationEnd(): Flow<Unit> {
+    return loadStateFlow
+        .map { it.append.endOfPaginationReached }
+        .distinctUntilChanged()
+        .filter { it }
+        .map { }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6d07ac4..bca5f84 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -42,9 +42,9 @@
 	<string name="fragment_authentication_email_input_helper_text">Пример: changeme@email.com</string>
 	<string name="fragment_authentication_password_input_helper_text">Пример: demo</string>
 	<string name="fragment_recipes_last_page_loaded_toast">Последняя страница</string>
-	<string name="fragment_recipes_load_failure_toast">%1$s %2$s</string>
-	<string name="fragment_recipes_load_failure_toast_general">Ошибка загрузки.</string>
-	<string name="fragment_recipes_load_failure_toast_unauthorized">Неавторизован</string>
-	<string name="fragment_recipes_load_failure_toast_unexpected_response">Неожиданный ответ</string>
-	<string name="fragment_recipes_load_failure_toast_no_connection">Нет соединения</string>
+	<string name="fragment_recipes_load_failure_toast">Ошибка загрузки: %1$s.</string>
+	<string name="fragment_recipes_load_failure_toast_unauthorized">неавторизован</string>
+	<string name="fragment_recipes_load_failure_toast_unexpected_response">неожиданный ответ</string>
+	<string name="fragment_recipes_load_failure_toast_no_connection">нет соединения</string>
+	<string name="fragment_recipes_load_failure_toast_no_reason">Ошибка загрузки.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a5c59e..7bd2a7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,9 +46,9 @@
 	<string name="fragment_authentication_email_input_helper_text">Example: changeme@email.com</string>
 	<string name="fragment_authentication_password_input_helper_text">Example: demo</string>
 	<string name="fragment_recipes_last_page_loaded_toast">Last page loaded</string>
-	<string name="fragment_recipes_load_failure_toast" comment="EXAMPLE: Load failed! Unauthorized">%1$s %2$s</string>
-	<string name="fragment_recipes_load_failure_toast_general">Load failed.</string>
-	<string name="fragment_recipes_load_failure_toast_unauthorized">Unauthorized</string>
-	<string name="fragment_recipes_load_failure_toast_unexpected_response">Unexpected response</string>
-	<string name="fragment_recipes_load_failure_toast_no_connection">No connection</string>
+	<string name="fragment_recipes_load_failure_toast" comment="EXAMPLE: Load error: unauthorized.">Load error: %1$s.</string>
+	<string name="fragment_recipes_load_failure_toast_no_reason">Load failed.</string>
+	<string name="fragment_recipes_load_failure_toast_unauthorized">unauthorized</string>
+	<string name="fragment_recipes_load_failure_toast_unexpected_response">unexpected response</string>
+	<string name="fragment_recipes_load_failure_toast_no_connection">no connection</string>
 </resources>
\ No newline at end of file

From 1ee0456494781f501e461b6bf45b59b9d7603d86 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sat, 5 Nov 2022 10:57:56 +0100
Subject: [PATCH 06/11] Use repeatOnLifecycle

---
 .../mealient/extensions/FragmentExtensions.kt | 23 ++++++++-----------
 .../mealient/ui/recipes/RecipesFragment.kt    |  5 ++--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt b/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt
index b6034cb..4502b15 100644
--- a/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/extensions/FragmentExtensions.kt
@@ -3,24 +3,19 @@ package gq.kirmanak.mealient.extensions
 import android.widget.Toast
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.CoroutineScope
+import androidx.lifecycle.repeatOnLifecycle
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
-import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.launch
 
-fun <T> Fragment.collectWhenViewResumed(
-    flow: Flow<T>,
-    collector: FlowCollector<T>,
-) = launchWhenViewResumed { flow.collect(collector) }
-
-fun Fragment.launchWhenViewResumed(
-    block: suspend CoroutineScope.() -> Unit,
-) = viewLifecycleOwner.lifecycleScope.launchWhenResumed(block)
-
-fun <T> Flow<T>.launchIn(lifecycleOwner: LifecycleOwner) {
-    launchIn(lifecycleOwner.lifecycleScope)
+fun <T> Fragment.collectWhenViewResumed(flow: Flow<T>, collector: FlowCollector<T>) {
+    viewLifecycleOwner.lifecycleScope.launch {
+        viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+            flow.collect(collector)
+        }
+    }
 }
 
 fun Fragment.showLongToast(@StringRes text: Int) = showLongToast(getString(text))
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
index 6981ae8..64fb48f 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
@@ -17,7 +17,6 @@ import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity
 import gq.kirmanak.mealient.databinding.FragmentRecipesBinding
 import gq.kirmanak.mealient.datasource.NetworkError
 import gq.kirmanak.mealient.extensions.collectWhenViewResumed
-import gq.kirmanak.mealient.extensions.launchIn
 import gq.kirmanak.mealient.extensions.refreshRequestFlow
 import gq.kirmanak.mealient.extensions.showLongToast
 import gq.kirmanak.mealient.logging.Logger
@@ -104,8 +103,8 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
     }
 
     private fun <T : Any, VH : RecyclerView.ViewHolder> PagingDataAdapter<T, VH>.observeLoadStateChanges() {
-        appendPaginationEnd().onEach { onPaginationEnd() }.launchIn(viewLifecycleOwner)
-        refreshErrors().onEach { onLoadFailure(it) }.launchIn(viewLifecycleOwner)
+        collectWhenViewResumed(appendPaginationEnd()) { onPaginationEnd() }
+        collectWhenViewResumed(refreshErrors()) { onLoadFailure(it) }
     }
 
     private fun onPaginationEnd() {

From 7800d7e7542b31a1346ba8a0aa0af63047e87f48 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sat, 5 Nov 2022 11:06:21 +0100
Subject: [PATCH 07/11] Simplify RecipesPagingAdapter creation

---
 .../mealient/ui/recipes/RecipesFragment.kt       |  8 +-------
 .../mealient/ui/recipes/RecipesPagingAdapter.kt  | 16 ++++++++++------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
index 64fb48f..50342d0 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
@@ -21,7 +21,6 @@ import gq.kirmanak.mealient.extensions.refreshRequestFlow
 import gq.kirmanak.mealient.extensions.showLongToast
 import gq.kirmanak.mealient.logging.Logger
 import gq.kirmanak.mealient.ui.activity.MainActivityViewModel
-import gq.kirmanak.mealient.ui.recipes.images.RecipeImageLoader
 import gq.kirmanak.mealient.ui.recipes.images.RecipePreloaderFactory
 import kotlinx.coroutines.flow.*
 import javax.inject.Inject
@@ -36,9 +35,6 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
     @Inject
     lateinit var logger: Logger
 
-    @Inject
-    lateinit var recipeImageLoader: RecipeImageLoader
-
     @Inject
     lateinit var recipePagingAdapterFactory: RecipesPagingAdapter.Factory
 
@@ -66,9 +62,7 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
     private fun setupRecipeAdapter() {
         logger.v { "setupRecipeAdapter() called" }
 
-        val recipesAdapter = recipePagingAdapterFactory.build(
-            recipeImageLoader = recipeImageLoader, clickListener = ::navigateToRecipeInfo
-        )
+        val recipesAdapter = recipePagingAdapterFactory.build { navigateToRecipeInfo(it) }
 
         with(binding.recipes) {
             adapter = recipesAdapter
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesPagingAdapter.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesPagingAdapter.kt
index c2cb7af..cde6fb9 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesPagingAdapter.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesPagingAdapter.kt
@@ -4,12 +4,12 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
+import dagger.hilt.android.scopes.FragmentScoped
 import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity
 import gq.kirmanak.mealient.databinding.ViewHolderRecipeBinding
 import gq.kirmanak.mealient.logging.Logger
 import gq.kirmanak.mealient.ui.recipes.images.RecipeImageLoader
 import javax.inject.Inject
-import javax.inject.Singleton
 
 class RecipesPagingAdapter private constructor(
     private val logger: Logger,
@@ -18,19 +18,23 @@ class RecipesPagingAdapter private constructor(
     private val clickListener: (RecipeSummaryEntity) -> Unit
 ) : PagingDataAdapter<RecipeSummaryEntity, RecipeViewHolder>(RecipeDiffCallback) {
 
-    @Singleton
+    @FragmentScoped
     class Factory @Inject constructor(
         private val logger: Logger,
         private val recipeViewHolderFactory: RecipeViewHolder.Factory,
+        private val recipeImageLoader: RecipeImageLoader,
     ) {
 
-        fun build(
-            recipeImageLoader: RecipeImageLoader,
-            clickListener: (RecipeSummaryEntity) -> Unit,
-        ) = RecipesPagingAdapter(logger, recipeImageLoader, recipeViewHolderFactory, clickListener)
+        fun build(clickListener: (RecipeSummaryEntity) -> Unit) = RecipesPagingAdapter(
+            logger,
+            recipeImageLoader,
+            recipeViewHolderFactory,
+            clickListener
+        )
     }
 
     override fun onBindViewHolder(holder: RecipeViewHolder, position: Int) {
+        logger.d { "onBindViewHolder() called with: holder = $holder, position = $position" }
         val item = getItem(position)
         holder.bind(item)
     }

From 39ce70f9641f51f4f779c42e63eaf8d81343d0cb Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sat, 5 Nov 2022 11:08:12 +0100
Subject: [PATCH 08/11] Remove unnecessary method

---
 .../mealient/ui/recipes/RecipesFragment.kt    | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
index 50342d0..3260b53 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
@@ -79,7 +79,14 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
             binding.refresher.isRefreshing = false
         }
 
-        recipesAdapter.observeLoadStateChanges()
+        collectWhenViewResumed(recipesAdapter.appendPaginationEnd()) {
+            logger.v { "onPaginationEnd() called" }
+            showLongToast(R.string.fragment_recipes_last_page_loaded_toast)
+        }
+
+        collectWhenViewResumed(recipesAdapter.refreshErrors()) {
+            onLoadFailure(it)
+        }
 
         collectWhenViewResumed(binding.refresher.refreshRequestFlow(logger)) {
             logger.v { "setupRecipeAdapter: received refresh request" }
@@ -96,16 +103,6 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) {
         }
     }
 
-    private fun <T : Any, VH : RecyclerView.ViewHolder> PagingDataAdapter<T, VH>.observeLoadStateChanges() {
-        collectWhenViewResumed(appendPaginationEnd()) { onPaginationEnd() }
-        collectWhenViewResumed(refreshErrors()) { onLoadFailure(it) }
-    }
-
-    private fun onPaginationEnd() {
-        logger.v { "onPaginationEnd() called" }
-        showLongToast(R.string.fragment_recipes_last_page_loaded_toast)
-    }
-
     private fun onLoadFailure(error: Throwable) {
         logger.w(error) { "onLoadFailure() called" }
         val reason = error.toLoadErrorReasonText()?.let { getString(it) }

From d873bfa2ed75775489a6786638a9e7ad5ff5eed1 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sat, 5 Nov 2022 11:32:17 +0100
Subject: [PATCH 09/11] Ignore load errors if wasn't loading

---
 .../mealient/extensions/FlowExtensions.kt     | 23 +++++++++++++++++++
 .../mealient/ui/recipes/RecipeViewModel.kt    | 12 ++++------
 .../mealient/ui/recipes/RecipesFragment.kt    | 12 ++++++----
 3 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/gq/kirmanak/mealient/extensions/FlowExtensions.kt

diff --git a/app/src/main/java/gq/kirmanak/mealient/extensions/FlowExtensions.kt b/app/src/main/java/gq/kirmanak/mealient/extensions/FlowExtensions.kt
new file mode 100644
index 0000000..eedafc0
--- /dev/null
+++ b/app/src/main/java/gq/kirmanak/mealient/extensions/FlowExtensions.kt
@@ -0,0 +1,23 @@
+package gq.kirmanak.mealient.extensions
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+
+fun <T> Flow<T>.valueUpdatesOnly(): Flow<T> = when (this) {
+    is ValueUpdateOnlyFlowImpl<T> -> this
+    else -> ValueUpdateOnlyFlowImpl(this)
+}
+
+private class ValueUpdateOnlyFlowImpl<T>(private val upstream: Flow<T>) : Flow<T> {
+
+    override suspend fun collect(collector: FlowCollector<T>) {
+        var previousValue: T? = null
+        upstream.collect { value ->
+            if (previousValue != null && previousValue != value) {
+                collector.emit(value)
+            }
+            previousValue = value
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
index 998af6d..7e3a733 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
@@ -8,9 +8,10 @@ import androidx.paging.cachedIn
 import dagger.hilt.android.lifecycle.HiltViewModel
 import gq.kirmanak.mealient.data.auth.AuthRepo
 import gq.kirmanak.mealient.data.recipes.RecipeRepo
+import gq.kirmanak.mealient.extensions.valueUpdatesOnly
 import gq.kirmanak.mealient.logging.Logger
 import kotlinx.coroutines.flow.launchIn
-import kotlinx.coroutines.flow.runningReduce
+import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 @HiltViewModel
@@ -26,12 +27,9 @@ class RecipeViewModel @Inject constructor(
     val isAuthorized: LiveData<Boolean?> = _isAuthorized
 
     init {
-        authRepo.isAuthorizedFlow.runningReduce { wasAuthorized, isAuthorized ->
-            logger.v { "Authorization state changed from $wasAuthorized to $isAuthorized" }
-            if (wasAuthorized != isAuthorized) {
-                _isAuthorized.postValue(isAuthorized)
-            }
-            isAuthorized
+        authRepo.isAuthorizedFlow.valueUpdatesOnly().onEach {
+            logger.v { "Authorization state changed to $it" }
+            _isAuthorized.postValue(it)
         }.launchIn(viewModelScope)
     }
 
diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
index 3260b53..b0fe05b 100644
--- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
@@ -19,10 +19,14 @@ import gq.kirmanak.mealient.datasource.NetworkError
 import gq.kirmanak.mealient.extensions.collectWhenViewResumed
 import gq.kirmanak.mealient.extensions.refreshRequestFlow
 import gq.kirmanak.mealient.extensions.showLongToast
+import gq.kirmanak.mealient.extensions.valueUpdatesOnly
 import gq.kirmanak.mealient.logging.Logger
 import gq.kirmanak.mealient.ui.activity.MainActivityViewModel
 import gq.kirmanak.mealient.ui.recipes.images.RecipePreloaderFactory
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterIsInstance
+import kotlinx.coroutines.flow.map
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -133,7 +137,7 @@ private fun Throwable.toLoadErrorReasonText(): Int? = when (this) {
 private fun <T : Any, VH : RecyclerView.ViewHolder> PagingDataAdapter<T, VH>.refreshErrors(): Flow<Throwable> {
     return loadStateFlow
         .map { it.refresh }
-        .distinctUntilChanged()
+        .valueUpdatesOnly()
         .filterIsInstance<LoadState.Error>()
         .map { it.error }
 }
@@ -141,7 +145,7 @@ private fun <T : Any, VH : RecyclerView.ViewHolder> PagingDataAdapter<T, VH>.ref
 private fun <T : Any, VH : RecyclerView.ViewHolder> PagingDataAdapter<T, VH>.appendPaginationEnd(): Flow<Unit> {
     return loadStateFlow
         .map { it.append.endOfPaginationReached }
-        .distinctUntilChanged()
+        .valueUpdatesOnly()
         .filter { it }
         .map { }
-}
\ No newline at end of file
+}

From 2027f6ac60784f13fe9c2dce6e7171414923f7db Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sat, 5 Nov 2022 11:44:14 +0100
Subject: [PATCH 10/11] Add valueUpdatesOnly tests

---
 .../extensions/FlowExtensionsKtTest.kt        | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 app/src/test/java/gq/kirmanak/mealient/extensions/FlowExtensionsKtTest.kt

diff --git a/app/src/test/java/gq/kirmanak/mealient/extensions/FlowExtensionsKtTest.kt b/app/src/test/java/gq/kirmanak/mealient/extensions/FlowExtensionsKtTest.kt
new file mode 100644
index 0000000..58f9101
--- /dev/null
+++ b/app/src/test/java/gq/kirmanak/mealient/extensions/FlowExtensionsKtTest.kt
@@ -0,0 +1,42 @@
+package gq.kirmanak.mealient.extensions
+
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class FlowExtensionsKtTest {
+
+    @Test
+    fun `when flow has an update then valueUpdatesOnly sends updated value`() = runTest {
+        val flow = flowOf(1, 2)
+        assertThat(flow.valueUpdatesOnly().toList()).isEqualTo(listOf(2))
+    }
+
+    @Test
+    fun `when flow has repeated values then valueUpdatesOnly sends updated value`() = runTest {
+        val flow = flowOf(1, 1, 1, 2)
+        assertThat(flow.valueUpdatesOnly().toList()).isEqualTo(listOf(2))
+    }
+
+    @Test
+    fun `when flow has one value then valueUpdatesOnly is empty`() = runTest {
+        val flow = flowOf(1)
+        assertThat(flow.valueUpdatesOnly().toList()).isEmpty()
+    }
+
+    @Test
+    fun `when flow has two updates then valueUpdatesOnly sends both`() = runTest {
+        val flow = flowOf(1, 2, 1)
+        assertThat(flow.valueUpdatesOnly().toList()).isEqualTo(listOf(2, 1))
+    }
+
+    @Test
+    fun `when flow has three updates then valueUpdatesOnly sends all`() = runTest {
+        val flow = flowOf(1, 2, 1, 3)
+        assertThat(flow.valueUpdatesOnly().toList()).isEqualTo(listOf(2, 1, 3))
+    }
+}
\ No newline at end of file

From dfd590ee5082fe10c6a7f2f76bf4c9f4d174a532 Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Sat, 5 Nov 2022 12:17:48 +0100
Subject: [PATCH 11/11] Add RecipeViewModel tests

---
 app/build.gradle.kts                          |  1 +
 .../ui/recipes/RecipeViewModelTest.kt         | 75 +++++++++++++++++++
 gradle/libs.versions.toml                     |  3 +
 3 files changed, 79 insertions(+)
 create mode 100644 app/src/test/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModelTest.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1025875..ccca534 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -122,6 +122,7 @@ dependencies {
     testImplementation(libs.robolectric)
 
     testImplementation(libs.androidx.test.junit)
+    testImplementation(libs.androidx.coreTesting)
 
     testImplementation(libs.google.truth)
 
diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModelTest.kt b/app/src/test/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModelTest.kt
new file mode 100644
index 0000000..e433300
--- /dev/null
+++ b/app/src/test/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModelTest.kt
@@ -0,0 +1,75 @@
+package gq.kirmanak.mealient.ui.recipes
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.google.common.truth.Truth.assertThat
+import gq.kirmanak.mealient.data.auth.AuthRepo
+import gq.kirmanak.mealient.data.recipes.RecipeRepo
+import gq.kirmanak.mealient.logging.Logger
+import gq.kirmanak.mealient.test.FakeLogger
+import io.mockk.MockKAnnotations
+import io.mockk.every
+import io.mockk.impl.annotations.MockK
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.resetMain
+import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class RecipeViewModelTest {
+
+    @MockK
+    lateinit var authRepo: AuthRepo
+
+    @MockK(relaxed = true)
+    lateinit var recipeRepo: RecipeRepo
+
+    private val logger: Logger = FakeLogger()
+
+    @get:Rule
+    val instantExecutorRule = InstantTaskExecutorRule()
+
+    @Before
+    fun setUp() {
+        MockKAnnotations.init(this)
+        Dispatchers.setMain(UnconfinedTestDispatcher())
+    }
+
+    @After
+    fun tearDown() {
+        Dispatchers.resetMain()
+    }
+
+    @Test
+    fun `when authRepo isAuthorized changes to true expect isAuthorized update`() {
+        every { authRepo.isAuthorizedFlow } returns flowOf(false, true)
+        assertThat(createSubject().isAuthorized.value).isTrue()
+    }
+
+    @Test
+    fun `when authRepo isAuthorized changes to false expect isAuthorized update`() {
+        every { authRepo.isAuthorizedFlow } returns flowOf(true, false)
+        assertThat(createSubject().isAuthorized.value).isFalse()
+    }
+
+    @Test
+    fun `when authRepo isAuthorized doesn't change expect isAuthorized null`() {
+        every { authRepo.isAuthorizedFlow } returns flowOf(true)
+        assertThat(createSubject().isAuthorized.value).isNull()
+    }
+
+    @Test
+    fun `when isAuthorization change is handled expect isAuthorized null`() {
+        every { authRepo.isAuthorizedFlow } returns flowOf(true, false)
+        val subject = createSubject()
+        subject.onAuthorizationChangeHandled()
+        assertThat(subject.isAuthorized.value).isNull()
+    }
+
+    private fun createSubject() = RecipeViewModel(recipeRepo, authRepo, logger)
+}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 31cbf30..8478bd2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,6 +35,8 @@ swipeRefreshLayout = "1.1.0"
 splashScreen = "1.0.0"
 # https://developer.android.com/jetpack/androidx/releases/lifecycle
 lifecycle = "2.5.1"
+# https://developer.android.com/jetpack/androidx/releases/arch-core
+coreTesting = "2.1.0"
 # https://github.com/square/retrofit/tags
 retrofit = "2.9.0"
 # https://github.com/JakeWharton/retrofit2-kotlinx-serialization-converter/tags
@@ -121,6 +123,7 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 androidx-constraintLayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "contraintLayout" }
 androidx-swipeRefreshLayout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "swipeRefreshLayout" }
 androidx-splashScreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "splashScreen" }
+androidx-coreTesting = { group = "androidx.arch.core", name = "core-testing", version.ref = "coreTesting" }
 
 androidx-paging-runtimeKtx = { group = "androidx.paging", name = "paging-runtime-ktx", version.ref = "paging" }
 androidx-paging-commonKtx = { group = "androidx.paging", name = "paging-common-ktx", version.ref = "paging" }