Create activity refresh observable

1 files changed, 21 insertions, 1 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt
index 39c93b01..3c8094aa 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt
@@ -1,14 +1,17 @@
 package com.pitchedapps.frost.fragments
 
+import android.content.Context
 import android.os.Bundle
 import android.support.v4.widget.SwipeRefreshLayout
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.pitchedapps.frost.MainActivity
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.putString
 import com.pitchedapps.frost.web.FrostWebView
 import com.pitchedapps.frost.web.FrostWebViewCore
+import io.reactivex.disposables.Disposable
 
 /**
  * Created by Allan Wang on 2017-05-29.
@@ -22,11 +25,12 @@ class WebFragment : BaseFragment() {
         fun newInstance(position: Int, url: String) = BaseFragment.newInstance(WebFragment(), position).putString(ARG_URL, url)
     }
 
-    val refresh: SwipeRefreshLayout by lazy { frostWebView.refresh }
+//    val refresh: SwipeRefreshLayout by lazy { frostWebView.refresh }
     val web: FrostWebViewCore by lazy { frostWebView.web }
     lateinit var url: String
     lateinit private var frostWebView: FrostWebView
     private var firstLoad = true
+    private var refreshDisposable: Disposable? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -58,5 +62,21 @@ class WebFragment : BaseFragment() {
         }
     }
 
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        refreshDisposable?.dispose()
+        if (context is MainActivity)
+            refreshDisposable = context.refreshObservable.subscribe {
+                web.clearHistory()
+                web.loadBaseUrl()
+            }
+    }
+
+    override fun onDetach() {
+        refreshDisposable?.dispose()
+        L.d("F Detatch")
+        super.onDetach()
+    }
+
     override fun onBackPressed() = frostWebView.onBackPressed()
 }
\ No newline at end of file