From 02c3686002e187436f7e9df63dd23a1663052633 Mon Sep 17 00:00:00 2001
From: Kirill Nayduik <kirill.nayduikkn1@gmail.com>
Date: Mon, 16 Aug 2021 12:20:42 +1200
Subject: [PATCH] Move injection of dependencies inside onAttach method

---
 .../flow/ComponentHolder.kt                   | 20 -------------------
 .../navigation_cicerone/flow/FlowFragment.kt  | 14 ++-----------
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/ComponentHolder.kt

diff --git a/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/ComponentHolder.kt b/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/ComponentHolder.kt
deleted file mode 100644
index a889623..0000000
--- a/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/ComponentHolder.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package ru.touchin.roboswag.navigation_cicerone.flow
-
-import me.vponomarenko.injectionmanager.customlifecycle.StoredComponent
-import ru.touchin.roboswag.navigation_base.scopes.FeatureScope
-import javax.inject.Inject
-
-@FeatureScope
-class ComponentHolder<TComponent> @Inject constructor(){
-
-    private var storedComponent: StoredComponent<TComponent>? = null
-
-    fun setStoredComponent(storedComponent: StoredComponent<TComponent>) {
-        this.storedComponent = storedComponent
-    }
-
-    fun destroy() {
-        storedComponent?.lifecycle?.destroy()
-    }
-
-}
diff --git a/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/FlowFragment.kt b/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/FlowFragment.kt
index c7fce66..0b7d52e 100644
--- a/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/FlowFragment.kt
+++ b/navigation-cicerone/src/main/java/ru/touchin/roboswag/navigation_cicerone/flow/FlowFragment.kt
@@ -27,15 +27,8 @@ abstract class FlowFragment<TComponent> : Fragment(R.layout.fragment_flow) {
     @FlowNavigation
     lateinit var router: Router
 
-    @Inject
-    @FeatureScope
-    lateinit var componentHolder: ComponentHolder<TComponent>
-
     override fun onAttach(context: Context) {
-        if (!injectExistedComponent()) {
-            val storedComponent = injectComponent()
-            componentHolder.setStoredComponent(storedComponent)
-        }
+        injectComponent()
         super.onAttach(context)
     }
 
@@ -46,9 +39,7 @@ abstract class FlowFragment<TComponent> : Fragment(R.layout.fragment_flow) {
         }
     }
 
-    abstract fun injectComponent(): StoredComponent<TComponent>
-
-    abstract fun injectExistedComponent(): Boolean
+    abstract fun injectComponent()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -70,7 +61,6 @@ abstract class FlowFragment<TComponent> : Fragment(R.layout.fragment_flow) {
 
     private val exitRouterOnBackPressed = object : OnBackPressedCallback(true) {
         override fun handleOnBackPressed() {
-            componentHolder.destroy()
             router.exit()
         }
     }