diff options
author | Allan Wang <me@allanwang.ca> | 2017-06-13 17:07:09 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-06-13 17:07:09 -0700 |
commit | 0ac9d2181536b79a6057c3b526f32a1cc8ac4704 (patch) | |
tree | b561acf7fc94a79e8a48b548489e0f544d402b8c /app/src/main/kotlin/com/pitchedapps/frost/fragments | |
parent | e4377fed20ce1e3f4a0b236271eecdb1fe573b7a (diff) | |
download | frost-0ac9d2181536b79a6057c3b526f32a1cc8ac4704.tar.gz frost-0ac9d2181536b79a6057c3b526f32a1cc8ac4704.tar.bz2 frost-0ac9d2181536b79a6057c3b526f32a1cc8ac4704.zip |
Created working workaround for menu item
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/fragments')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt | 15 |
1 files changed, 7 insertions, 8 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 0f56592c..04b392ed 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragment.kt @@ -10,7 +10,6 @@ import android.view.ViewGroup import ca.allanwang.kau.utils.withBundle import com.pitchedapps.frost.MainActivity import com.pitchedapps.frost.facebook.FbTab -import com.pitchedapps.frost.injectors.JsAssets import com.pitchedapps.frost.web.FrostWebView import com.pitchedapps.frost.web.FrostWebViewCore import io.reactivex.android.schedulers.AndroidSchedulers @@ -25,21 +24,21 @@ class WebFragment : Fragment() { companion object { private const val ARG_URL = "arg_url" - private const val ARG_ID = "arg_id" + private const val ARG_URL_ENUM = "arg_url_enum" operator fun invoke(url: String) = WebFragment().withBundle { putString(ARG_URL, url) } operator fun invoke(data: FbTab) = WebFragment().withBundle { putString(ARG_URL, data.url) - if (data.javascript != null) putSerializable(ARG_ID, data.javascript) + putSerializable(ARG_URL_ENUM, data) } } // val refresh: SwipeRefreshLayout by lazy { frostWebView.refresh } val web: FrostWebViewCore by lazy { frostWebView.web } lateinit var url: String - var baseJavascript: JsAssets? = null + var urlEnum: FbTab? = null lateinit private var frostWebView: FrostWebView private var firstLoad = true private var refreshDisposable: Disposable? = null @@ -47,14 +46,13 @@ class WebFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) url = arguments.getString(ARG_URL) - baseJavascript = arguments.getSerializable(ARG_ID) as? JsAssets + urlEnum = arguments.getSerializable(ARG_URL_ENUM) as? FbTab } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { super.onCreateView(inflater, container, savedInstanceState) frostWebView = FrostWebView(context) - frostWebView.web.baseUrl = url - frostWebView.web.baseJavascript = baseJavascript + frostWebView.web.setupWebview(url, urlEnum) return frostWebView } @@ -106,7 +104,8 @@ class WebFragment : Fragment() { var pauseLoad: Boolean get() = web.settings.blockNetworkLoads set(value) { - web.settings.blockNetworkLoads = value + if (urlEnum != FbTab.MENU) + web.settings.blockNetworkLoads = value } |