From 74e05199872e9b09678822378856e225a79028b4 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 4 Aug 2019 23:39:00 -0700 Subject: Add pref toggle --- .../main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt | 3 ++- app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt | 3 ++- app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps') 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 73bd5b2f..2e7c16df 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseMainActivity.kt @@ -113,6 +113,7 @@ import kotlinx.android.synthetic.main.view_main_viewpager.* import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.launch import org.koin.android.ext.android.inject +import kotlin.math.abs /** * Created by Allan Wang on 20/12/17. @@ -206,7 +207,7 @@ abstract class BaseMainActivity : BaseActivity(), MainActivityContract, fab.hide() appBar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset -> if (!hasFab) return@OnOffsetChangedListener - val percent = Math.abs(verticalOffset.toFloat() / appBarLayout.totalScrollRange) + val percent = abs(verticalOffset.toFloat() / appBarLayout.totalScrollRange) val shouldShow = percent < 0.2 if (this.shouldShow != shouldShow) { this.shouldShow = shouldShow 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 72367eaa..7c96235f 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/WebFragments.kt @@ -23,6 +23,7 @@ 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.utils.Prefs import com.pitchedapps.frost.views.FrostWebView import com.pitchedapps.frost.web.FrostWebViewClient import com.pitchedapps.frost.web.FrostWebViewClientMenu @@ -51,7 +52,7 @@ class WebFragment : BaseFragment() { L.e { "Webview not found in fragment $baseEnum" } return super.updateFab(contract) } - if (baseEnum.isFeed) { + if (baseEnum.isFeed && Prefs.showCreateFab) { contract.showFab(GoogleMaterial.Icon.gmd_edit) { JsActions.CREATE_POST.inject(web) } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt index 0885109a..eb8e4b35 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt @@ -189,6 +189,8 @@ object Prefs : KPref() { var autoRefreshFeed: Boolean by kpref("auto_refresh_feed", false) + var showCreateFab: Boolean by kpref("show_create_fab", true) + inline val mainActivityLayout: MainActivityLayout get() = MainActivityLayout(mainActivityLayoutType) -- cgit v1.2.3