From 14fe356d62b117fee4b8b0e3f4d849021dad3aef Mon Sep 17 00:00:00 2001 From: ekager Date: Fri, 31 May 2019 15:38:54 -0700 Subject: [PATCH] For #2794 - Adjust engine margins when enter/exit fullscreen --- .../mozilla/fenix/browser/BrowserFragment.kt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index 516f0a101..78aea5f9d 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -14,6 +14,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity +import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.fragment.app.Fragment import androidx.lifecycle.ViewModelProviders import androidx.navigation.Navigation @@ -317,6 +318,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope { toolbar.visibility = View.VISIBLE nestedScrollQuickAction.visibility = View.VISIBLE } + changeEngineMargins(swipeRefresh = view.swipeRefresh, inFullScreen = it) }, owner = this, view = view @@ -388,6 +390,21 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope { } } + private fun changeEngineMargins(swipeRefresh: View, inFullScreen: Boolean) { + swipeRefresh.apply { + val toolbarAndQASSize = resources.getDimension(R.dimen.toolbar_and_qab_height).toInt() + val toolbarSize = resources.getDimension(R.dimen.browser_toolbar_height).toInt() + (layoutParams as CoordinatorLayout.LayoutParams).apply { + setMargins( + 0, + if (customTabSessionId == null || inFullScreen) 0 else toolbarSize, + 0, + if (inFullScreen) 0 else if (customTabSessionId == null) toolbarAndQASSize else 0 + ) + } + } + } + override fun onResume() { if (getSessionById() == null) findNavController(this).popBackStack(R.id.homeFragment, false) super.onResume()