Feature/post (#696)v1.8.1

* Reorder final override

* Add initial fab bindings

* Update scripts

* Optimize and use js header hider

* Remove old header hider

* Use method for generating clicker

17 files changed, 144 insertions, 41 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt
index c5e1fbce..267a07a2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt
@@ -17,7 +17,7 @@ abstract class BaseActivity : KauBaseActivity() {
      */
     protected open fun backConsumer(): Boolean = false
 
-    override final fun onBackPressed() {
+    final override fun onBackPressed() {
         if (this is SearchViewHolder && searchViewOnBackPress()) return
         if (this is VideoViewHolder && videoOnBackPress()) return
         if (backConsumer()) return
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
index 743ac474..54fa0b8c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt
@@ -6,6 +6,7 @@ import android.app.AlarmManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.res.ColorStateList
 import android.graphics.PointF
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
@@ -40,6 +41,7 @@ import co.zsmb.materialdrawerkt.draweritems.profile.profileSetting
 import com.crashlytics.android.answers.ContentViewEvent
 import com.mikepenz.google_material_typeface_library.GoogleMaterial
 import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.typeface.IIcon
 import com.mikepenz.materialdrawer.AccountHeader
 import com.mikepenz.materialdrawer.Drawer
 import com.pitchedapps.frost.BuildConfig
@@ -94,7 +96,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
     private val searchViewCache = mutableMapOf<String, List<SearchItem>>()
     private var controlWebview: WebView? = null
 
-    override final fun onCreate(savedInstanceState: Bundle?) {
+    final override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val start = System.currentTimeMillis()
         setFrameContentView(Prefs.mainActivityLayout.layoutRes)
@@ -104,13 +106,10 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
             header(appBar)
             background(viewPager)
         }
-        L.i { "Main AAA ${System.currentTimeMillis() - start} ms" }
         setSupportActionBar(toolbar)
         adapter = SectionsPagerAdapter(loadFbTabs())
         viewPager.adapter = adapter
         viewPager.offscreenPageLimit = TAB_COUNT
-        L.i { "Main BBB ${System.currentTimeMillis() - start} ms" }
-        L.i { "Main CCC ${System.currentTimeMillis() - start} ms" }
         tabs.setBackgroundColor(Prefs.mainActivityLayout.backgroundColor())
         onNestedCreate(savedInstanceState)
         L.i { "Main finished loading UI in ${System.currentTimeMillis() - start} ms" }
@@ -131,6 +130,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
         }
         setupDrawer(savedInstanceState)
         L.i { "Main started in ${System.currentTimeMillis() - start} ms" }
+        initFab()
     }
 
     /**
@@ -138,6 +138,45 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
      */
     protected abstract fun onNestedCreate(savedInstanceState: Bundle?)
 
+    private var hasFab = false
+    private var shouldShow = false
+
+    private fun initFab() {
+        hasFab = false
+        shouldShow = false
+        fab.backgroundTintList = ColorStateList.valueOf(Prefs.headerColor.withMinAlpha(200))
+        fab.hide()
+        appBar.addOnOffsetChangedListener { appBarLayout, verticalOffset ->
+            if (!hasFab) return@addOnOffsetChangedListener
+            val percent = Math.abs(verticalOffset.toFloat() / appBarLayout.totalScrollRange)
+            val shouldShow = percent < 0.2
+            if (this.shouldShow != shouldShow) {
+                this.shouldShow = shouldShow
+                fab.showIf(shouldShow)
+            }
+        }
+    }
+
+    override fun showFab(iicon: IIcon, clickEvent: () -> Unit) {
+        hasFab = true
+        fab.setOnClickListener { clickEvent() }
+        if (shouldShow) {
+            if (fab.isShown) {
+                fab.fadeScaleTransition {
+                    setIcon(iicon, Prefs.iconColor)
+                }
+                return
+            }
+        }
+        fab.setIcon(iicon, Prefs.iconColor)
+        fab.showIf(shouldShow)
+    }
+
+    override fun hideFab() {
+        hasFab = false
+        fab.setOnClickListener(null)
+        fab.hide()
+    }
 
     fun tabsForEachView(action: (position: Int, view: BadgedIcon) -> Unit) {
         (0 until tabs.tabCount).asSequence().forEach { i ->
@@ -195,7 +234,8 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract,
                             } else {
                                 materialDialogThemed {
                                     title(R.string.kau_logout)
-                                    content(String.format(string(R.string.kau_logout_confirm_as_x), currentCookie.name ?: Prefs.userId.toString()))
+                                    content(String.format(string(R.string.kau_logout_confirm_as_x), currentCookie.name
+                                            ?: Prefs.userId.toString()))
                                     positiveText(R.string.kau_yes)
                                     negativeText(R.string.kau_no)
                                     onPositive { _, _ -> FbCookie.logout(this@BaseMainActivity) }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/contracts/ActivityContract.kt b/app/src/main/kotlin/com/pitchedapps/frost/contracts/ActivityContract.kt
index 559c2d0f..7dce6c6e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/contracts/ActivityContract.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/contracts/ActivityContract.kt
@@ -1,5 +1,6 @@
 package com.pitchedapps.frost.contracts
 
+import com.mikepenz.iconics.typeface.IIcon
 import com.pitchedapps.frost.fragments.BaseFragment
 import io.reactivex.subjects.PublishSubject
 
@@ -8,10 +9,15 @@ import io.reactivex.subjects.PublishSubject
  */
 interface ActivityContract : FileChooserActivityContract
 
-interface MainActivityContract : ActivityContract {
+interface MainActivityContract : ActivityContract, MainFabContract {
     val fragmentSubject: PublishSubject<Int>
     fun setTitle(res: Int)
     fun setTitle(text: CharSequence)
     fun collapseAppBar()
     fun reloadFragment(fragment: BaseFragment)
+}
+
+interface MainFabContract {
+    fun showFab(iicon: IIcon, clickEvent: () -> Unit)
+    fun hideFab()
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
index 462fae79..a02cbe59 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbItem.kt
@@ -45,6 +45,12 @@ enum class FbItem(
 
     val url = "$FB_URL_BASE$relativeUrl"
 
+    val isFeed: Boolean
+        get() = when (this) {
+            FEED, FEED_MOST_RECENT, FEED_TOP_STORIES -> true
+            else -> false
+        }
+
     override val bundleContract: EnumBundleCompanion<FbItem>
         get() = Companion
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
index 0aaeaa6d..b77847de 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentBase.kt
@@ -2,14 +2,19 @@ package com.pitchedapps.frost.fragments
 
 import android.content.Context
 import android.os.Bundle
+import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import ca.allanwang.kau.utils.fadeScaleTransition
+import ca.allanwang.kau.utils.setIcon
 import ca.allanwang.kau.utils.withArguments
+import com.mikepenz.iconics.typeface.IIcon
 import com.pitchedapps.frost.contracts.DynamicUiContract
 import com.pitchedapps.frost.contracts.FrostContentParent
 import com.pitchedapps.frost.contracts.MainActivityContract
+import com.pitchedapps.frost.contracts.MainFabContract
 import com.pitchedapps.frost.enums.FeedSort
 import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.utils.*
@@ -70,7 +75,7 @@ abstract class BaseFragment : Fragment(), FragmentContract, DynamicUiContract {
             throw IllegalArgumentException("${this::class.java.simpleName} is not attached to a context implementing MainActivityContract")
     }
 
-    override final fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(layoutRes, container, false)
         val content = view  as? FrostContentParent
                 ?: throw IllegalArgumentException("layoutRes for fragment must return view implementing FrostContentParent")
@@ -118,6 +123,7 @@ abstract class BaseFragment : Fragment(), FragmentContract, DynamicUiContract {
                     }
                     position -> {
                         contract.setTitle(baseEnum.titleId)
+                        updateFab(contract)
                         core?.active = true
                     }
                     -(position + 1) -> {
@@ -129,6 +135,22 @@ abstract class BaseFragment : Fragment(), FragmentContract, DynamicUiContract {
                 }
             }
 
+    override fun updateFab(contract: MainFabContract) {
+        contract.hideFab() // default
+    }
+
+    protected fun FloatingActionButton.update(iicon: IIcon, click: () -> Unit) {
+        if (isShown) {
+            fadeScaleTransition {
+                setIcon(iicon, Prefs.iconColor)
+            }
+        } else {
+            setIcon(iicon, Prefs.iconColor)
+            show()
+        }
+        setOnClickListener { click() }
+    }
+
     override fun detachMainObservable() {
         activityDisposable?.dispose()
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt
index 98a081e6..e683b056 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/FragmentContract.kt
@@ -1,9 +1,7 @@
 package com.pitchedapps.frost.fragments
 
-import com.pitchedapps.frost.contracts.FrostContentContainer
-import com.pitchedapps.frost.contracts.FrostContentCore
-import com.pitchedapps.frost.contracts.FrostContentParent
-import com.pitchedapps.frost.contracts.MainActivityContract
+import android.support.design.widget.FloatingActionButton
+import com.pitchedapps.frost.contracts.*
 import com.pitchedapps.frost.views.FrostRecyclerView
 import io.reactivex.disposables.Disposable
 
@@ -48,6 +46,8 @@ interface FragmentContract : FrostContentContainer {
      */
     fun firstLoadRequest()
 
+    fun updateFab(contract: MainFabContract)
+
     /**
      * Single callable action to be executed upon creation
      * Note that this call is not guaranteed
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt
index cdeaa3c1..51df4606 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragmentBase.kt
@@ -31,7 +31,7 @@ abstract class RecyclerFragment : BaseFragment(), RecyclerContentContract {
         }
     }
 
-    override final fun reload(progress: (Int) -> Unit, callback: (Boolean) -> Unit) {
+    final override fun reload(progress: (Int) -> Unit, callback: (Boolean) -> Unit) {
         reloadImpl(progress) {
             if (it)
                 callback(it)
@@ -49,7 +49,7 @@ abstract class GenericRecyclerFragment<T, Item : IItem<*, *>> : RecyclerFragment
 
     val adapter: ModelAdapter<T, Item> = ModelAdapter(this::mapper)
 
-    override final fun bind(recyclerView: FrostRecyclerView) {
+    final override fun bind(recyclerView: FrostRecyclerView) {
         recyclerView.adapter = getAdapter()
         recyclerView.onReloadClear = { adapter.clear() }
         bindImpl(recyclerView)
@@ -81,7 +81,7 @@ abstract class FrostParserFragment<T : Any, Item : IItem<*, *>> : RecyclerFragme
 
     val adapter: ItemAdapter<Item> = ItemAdapter()
 
-    override final fun bind(recyclerView: FrostRecyclerView) {
+    final override fun bind(recyclerView: FrostRecyclerView) {
         recyclerView.adapter = getAdapter()
         recyclerView.onReloadClear = { adapter.clear() }
         bindImpl(recyclerView)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt
index cdeea064..8000c106 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt
@@ -1,7 +1,12 @@
 package com.pitchedapps.frost.fragments
 
+import android.webkit.WebView
+import com.mikepenz.google_material_typeface_library.GoogleMaterial
 import com.pitchedapps.frost.R
+import com.pitchedapps.frost.contracts.MainFabContract
 import com.pitchedapps.frost.facebook.FbItem
+import com.pitchedapps.frost.injectors.JsActions
+import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.views.FrostWebView
 import com.pitchedapps.frost.web.FrostWebViewClient
 import com.pitchedapps.frost.web.FrostWebViewClientMenu
@@ -24,4 +29,20 @@ class WebFragment : BaseFragment() {
         else -> FrostWebViewClient(web)
     }
 
+    override fun updateFab(contract: MainFabContract) {
+        L.e { "Update fab" }
+        val web = core as? WebView
+        if (web == null) {
+            L.e { "Webview not found in fragment $baseEnum" }
+            return super.updateFab(contract)
+        }
+        if (baseEnum.isFeed) {
+            contract.showFab(GoogleMaterial.Icon.gmd_edit) {
+                JsActions.CREATE_POST.inject(web)
+            }
+            L.e { "UPP" }
+            return
+        }
+        super.updateFab(contract)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
index 4a390d9a..637a5092 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/CssHider.kt
@@ -9,8 +9,8 @@ import android.webkit.WebView
  */
 enum class CssHider(vararg val items: String) : InjectorContract {
     CORE("[data-sigil=m_login_upsell]", "role=progressbar"),
-    HEADER("#header", "[data-sigil=MTopBlueBarHeader]",
-            "#header-notices", "[data-sigil*=m-promo-jewel-header]"),
+//    HEADER("#header", "[data-sigil=MTopBlueBarHeader]",
+//            "#header-notices", "[data-sigil*=m-promo-jewel-header]"),
     ADS("article[data-xt*=sponsor]",
             "article[data-store*=sponsor]"),
     PEOPLE_YOU_MAY_KNOW("article._d2r"),
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt
index 53eb9ede..7be8cd3c 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsActions.kt
@@ -16,6 +16,8 @@ enum class JsActions(body: String) : InjectorContract {
     LOGIN_CHECK("document.getElementById('signup-button')&&Frost.loadLogin();"),
     BASE_HREF("""document.write("<base href='$FB_URL_BASE'/>");"""),
     FETCH_BODY("""setTimeout(function(){var e=document.querySelector("main");e||(e=document.querySelector("body")),Frost.handleHtml(e.outerHTML)},1e2);"""),
+    CREATE_POST(clickBySelector("button[name=view_overview]")),
+//    CREATE_MSG(clickBySelector("a[rel=dialog]")),
     /**
      * Used as a pseudoinjector for maybe functions
      */
@@ -25,4 +27,9 @@ enum class JsActions(body: String) : InjectorContract {
 
     override fun inject(webView: WebView, callback: (() -> Unit)?) =
             JsInjector(function).inject(webView, callback)
-}
\ No newline at end of file
+
+}
+
+@Suppress("NOTHING_TO_INLINE")
+private inline fun clickBySelector(selector: String): String =
+        """document.querySelector("$selector").click()"""
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
index 9ff129d4..21d660b8 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/injectors/JsAssets.kt
@@ -12,7 +12,7 @@ import java.util.*
  * The enum name must match the css file name
  */
 enum class JsAssets : InjectorContract {
-    MENU, MENU_DEBUG, CLICK_A, CONTEXT_A, MEDIA, HEADER_BADGES, TEXTAREA_LISTENER, NOTIF_MSG,
+    MENU, MENU_DEBUG, CLICK_A, CONTEXT_A, MEDIA, HEADER_BADGES, HEADER_HIDER, TEXTAREA_LISTENER, NOTIF_MSG,
     DOCUMENT_WATCHER
     ;
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/parsers/FrostParser.kt b/app/src/main/kotlin/com/pitchedapps/frost/parsers/FrostParser.kt
index d5730e16..03e6209e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/parsers/FrostParser.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/parsers/FrostParser.kt
@@ -82,16 +82,16 @@ internal fun <T> List<T>.toJsonString(tag: String, indent: Int) = StringBuilder(
  */
 internal abstract class FrostParserBase<out T : Any>(private val redirectToText: Boolean) : FrostParser<T> {
 
-    override final fun parse(cookie: String?) = parseFromUrl(cookie, url)
+    final override fun parse(cookie: String?) = parseFromUrl(cookie, url)
 
-    override final fun parseFromData(cookie: String?, text: String): ParseResponse<T>? {
+    final override fun parseFromData(cookie: String?, text: String): ParseResponse<T>? {
         cookie ?: return null
         val doc = textToDoc(text) ?: return null
         val data = parseImpl(doc) ?: return null
         return ParseResponse(cookie, data)
     }
 
-    override final fun parseFromUrl(cookie: String?, url: String): ParseResponse<T>? =
+    final override fun parseFromUrl(cookie: String?, url: String): ParseResponse<T>? =
             parse(cookie, frostJsoup(cookie, url))
 
     override fun parse(cookie: String?, document: Document): ParseResponse<T>? {
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/EnumUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/EnumUtils.kt
index d20d1573..2a562ba2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/EnumUtils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/EnumUtils.kt
@@ -43,15 +43,15 @@ interface EnumBundleCompanion<E : Enum<E>> {
 }
 
 open class EnumCompanion<E : Enum<E>>(
-        override final val argTag: String,
-        override final val values: Array<E>) : EnumBundleCompanion<E> {
+        final override val argTag: String,
+        final override val values: Array<E>) : EnumBundleCompanion<E> {
 
-    override final val valueMap: Map<String, E> = values.map { it.name to it }.toMap()
+    final override val valueMap: Map<String, E> = values.map { it.name to it }.toMap()
 
-    override final fun get(name: String?) = super.get(name)
+    final override fun get(name: String?) = super.get(name)
 
-    override final fun get(bundle: BaseBundle?) = super.get(bundle)
+    final override fun get(bundle: BaseBundle?) = super.get(bundle)
 
-    override final fun get(intent: Intent?) = super.get(intent)
+    final override fun get(intent: Intent?) = super.get(intent)
 
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabBinder.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabBinder.kt
index f45e842d..cdfffb87 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabBinder.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/iab/IabBinder.kt
@@ -44,7 +44,7 @@ abstract class IabBinder : FrostBilling {
     val activity
         get() = activityRef.get()
 
-    override final fun Activity.onCreateBilling() {
+    final override fun Activity.onCreateBilling() {
         activityRef = WeakReference(this)
         doAsync {
             bp = BillingProcessor.newBillingProcessor(this@onCreateBilling, PUBLIC_BILLING_KEY, this@IabBinder)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
index 4f36fdba..d4e1c103 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt
@@ -65,7 +65,6 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
         if (url.isFacebookUrl)
             view.jsInject(
                     CssAssets.ROUND_ICONS.maybe(Prefs.showRoundedIcons),
-                    CssHider.HEADER,
                     CssHider.CORE,
                     CssHider.COMPOSER.maybe(!Prefs.showComposer),
                     CssHider.PEOPLE_YOU_MAY_KNOW.maybe(!Prefs.showSuggestedFriends && IS_FROST_PRO),
@@ -77,6 +76,7 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() {
                     JsAssets.CLICK_A,
                     CssHider.ADS.maybe(!Prefs.showFacebookAds && IS_FROST_PRO),
                     JsAssets.CONTEXT_A,
+                    JsAssets.HEADER_HIDER,
                     JsAssets.MEDIA)
         else
             refresh.onNext(false)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
index 44172416..1f22f303 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt
@@ -14,6 +14,7 @@ import com.pitchedapps.frost.facebook.FB_USER_MATCHER
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.get
 import com.pitchedapps.frost.injectors.CssHider
+import com.pitchedapps.frost.injectors.JsAssets
 import com.pitchedapps.frost.injectors.jsInject
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
@@ -72,7 +73,7 @@ class LoginWebView @JvmOverloads constructor(
             L.d { "Login page commit visible" }
             view.setBackgroundColor(Color.TRANSPARENT)
             if (url.isFacebookUrl)
-                view.jsInject(CssHider.HEADER,
+                view.jsInject(JsAssets.HEADER_HIDER,
                         CssHider.CORE,
                         Prefs.themeInjector)
         }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt
index f0bb6137..8fd4c0b4 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/NestedWebView.kt
@@ -41,7 +41,7 @@ open class NestedWebView @JvmOverloads constructor(
      * https://github.com/takahirom/webview-in-coordinatorlayout/blob/master/app/src/main/java/com/github/takahirom/webview_in_coodinator_layout/NestedWebView.java
      */
     @SuppressLint("ClickableViewAccessibility")
-    override final fun onTouchEvent(ev: MotionEvent): Boolean {
+    final override fun onTouchEvent(ev: MotionEvent): Boolean {
         val event = MotionEvent.obtain(ev)
         val action = event.action
         if (action == MotionEvent.ACTION_DOWN)
@@ -87,27 +87,27 @@ open class NestedWebView @JvmOverloads constructor(
      * ---------------------------------------------
      */
 
-    override final fun setNestedScrollingEnabled(enabled: Boolean) {
+    final override fun setNestedScrollingEnabled(enabled: Boolean) {
         childHelper.isNestedScrollingEnabled = enabled
     }
 
-    override final fun isNestedScrollingEnabled() = childHelper.isNestedScrollingEnabled
+    final override fun isNestedScrollingEnabled() = childHelper.isNestedScrollingEnabled
 
-    override final fun startNestedScroll(axes: Int) = childHelper.startNestedScroll(axes)
+    final override fun startNestedScroll(axes: Int) = childHelper.startNestedScroll(axes)
 
-    override final fun stopNestedScroll() = childHelper.stopNestedScroll()
+    final override fun stopNestedScroll() = childHelper.stopNestedScroll()
 
-    override final fun hasNestedScrollingParent() = childHelper.hasNestedScrollingParent()
+    final override fun hasNestedScrollingParent() = childHelper.hasNestedScrollingParent()
 
-    override final fun dispatchNestedScroll(dxConsumed: Int, dyConsumed: Int, dxUnconsumed: Int, dyUnconsumed: Int, offsetInWindow: IntArray?)
+    final override fun dispatchNestedScroll(dxConsumed: Int, dyConsumed: Int, dxUnconsumed: Int, dyUnconsumed: Int, offsetInWindow: IntArray?)
             = childHelper.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, offsetInWindow)
 
-    override final fun dispatchNestedPreScroll(dx: Int, dy: Int, consumed: IntArray?, offsetInWindow: IntArray?)
+    final override fun dispatchNestedPreScroll(dx: Int, dy: Int, consumed: IntArray?, offsetInWindow: IntArray?)
             = childHelper.dispatchNestedPreScroll(dx, dy, consumed, offsetInWindow)
 
-    override final fun dispatchNestedFling(velocityX: Float, velocityY: Float, consumed: Boolean)
+    final override fun dispatchNestedFling(velocityX: Float, velocityY: Float, consumed: Boolean)
             = childHelper.dispatchNestedFling(velocityX, velocityY, consumed)
 
-    override final fun dispatchNestedPreFling(velocityX: Float, velocityY: Float)
+    final override fun dispatchNestedPreFling(velocityX: Float, velocityY: Float)
             = childHelper.dispatchNestedPreFling(velocityX, velocityY)
 }
\ No newline at end of file