blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #3091 - Hide Pull to Refresh under flag (#3092) 

This was merged in after feature freeze so we're pulling it out for
now. Pull to refresh will continue to work in debug mode so that the
design can be iterated on easily.
master
Tiger Oakes 2019-06-03 12:10:53 -07:00 committed by Colin Lee
parent 04bbeb5ae6
commit 94c4013810
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -250,6 +250,7 @@ android.applicationVariants.all { variant ->
// Feature build flags // Feature build flags
// ------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------
buildConfigField 'Boolean', 'SEND_TAB_ENABLED', (buildType == "nightly" || isDebug).toString() buildConfigField 'Boolean', 'SEND_TAB_ENABLED', (buildType == "nightly" || isDebug).toString()
buildConfigField 'Boolean', 'PULL_TO_REFRESH_ENABLED', (false).toString()
} }
androidExtensions { androidExtensions {

32
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -56,6 +56,7 @@ import mozilla.components.support.ktx.android.view.enterToImmersiveMode
import mozilla.components.support.ktx.android.view.exitImmersiveModeIfNeeded import mozilla.components.support.ktx.android.view.exitImmersiveModeIfNeeded
import mozilla.components.support.ktx.kotlin.toUri import mozilla.components.support.ktx.kotlin.toUri
import org.mozilla.fenix.BrowsingModeManager import org.mozilla.fenix.BrowsingModeManager
import org.mozilla.fenix.BuildConfig
import org.mozilla.fenix.FenixViewModelProvider import org.mozilla.fenix.FenixViewModelProvider
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.IntentReceiverActivity import org.mozilla.fenix.IntentReceiverActivity
@ -185,7 +186,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
return view return view
} }
@Suppress("LongMethod") @Suppress("LongMethod", "ComplexMethod")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
@ -334,18 +335,23 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
view = view view = view
) )
val primaryTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, requireContext()) if (BuildConfig.PULL_TO_REFRESH_ENABLED) {
view.swipeRefresh.setColorSchemeColors(primaryTextColor) val primaryTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, requireContext())
swipeRefreshFeature.set( view.swipeRefresh.setColorSchemeColors(primaryTextColor)
feature = SwipeRefreshFeature( swipeRefreshFeature.set(
requireComponents.core.sessionManager, feature = SwipeRefreshFeature(
requireComponents.useCases.sessionUseCases.reload, requireComponents.core.sessionManager,
view.swipeRefresh, requireComponents.useCases.sessionUseCases.reload,
customTabSessionId view.swipeRefresh,
), customTabSessionId
owner = this, ),
view = view owner = this,
) view = view
)
} else {
// Disable pull to refresh
view.swipeRefresh.setOnChildScrollUpCallback { _, _ -> true }
}
readerViewFeature.set( readerViewFeature.set(
feature = ReaderViewFeature( feature = ReaderViewFeature(