Updated scrolling.

Author: anikiki

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

@@ -1018,14 +1018,38 @@ class BrowserTabFragment :
         // Move the trackersBlockedSlidingView in sync with the top omnibar.
         binding.trackersBlockedSlidingView.translationY = -binding.trackersBlockedSlidingView.height * (1 - scrollFraction)
         if (scrollFraction == 0.0f) {
-            binding.trackersBlockedSlidingView.gone()
+            binding.trackersBlockedSlidingView.post {
+                binding.trackersBlockedSlidingView.gone()
+            }
+            offsetTopBySlidingView(binding.browserLayout, scrollFraction)
         } else {
             if (binding.trackersBurstAnimationView.isAnimating) {
                 binding.trackersBurstAnimationView.cancelAnimation()
             }
             experimentTrackersCountAnimationHelper.animate(binding.trackers, viewModel.siteLiveData)
             binding.website.text = viewModel.url?.extractDomain()
-            binding.trackersBlockedSlidingView.show()
+            binding.trackersBlockedSlidingView.post {
+                binding.trackersBlockedSlidingView.x = 0f
+                binding.trackersBlockedSlidingView.y = 0f
+                binding.trackersBlockedSlidingView.show()
+            }
+            offsetTopBySlidingView(binding.browserLayout, scrollFraction)
+        }
+    }
+
+    private fun offsetTopBySlidingView(
+        view: View?,
+        scrollFraction: Float,
+    ) {
+        (view?.layoutParams as? CoordinatorLayout.LayoutParams)?.let { layoutParams ->
+            val newTopMargin =
+                binding.trackersBlockedSlidingView.measuredHeight - binding.trackersBlockedSlidingView.height * (1 - scrollFraction).toInt()
+            if (layoutParams.topMargin != newTopMargin) {
+                layoutParams.topMargin = newTopMargin
+                view.postOnAnimation {
+                    view.requestLayout()
+                }
+            }
         }
     }
 

app/src/main/java/com/duckduckgo/app/browser/omnibar/TrackersBlockedViewSlideBehavior.kt

@@ -93,14 +93,17 @@ class TrackersBlockedViewSlideBehavior(
         if (bottomOmnibar?.isOmnibarScrollingEnabled() == true && isSiteProtected()) {
             val translation = bottomOmnibar?.getTranslation() ?: 0f
             val bottomOmnibarHeight = bottomOmnibar?.height ?: 0
+            val childHeight = child.height
             if (translation == 0f || translation < bottomOmnibarHeight || browserLayout?.isGone == true || bottomOmnibar?.isInsideScreen() == true) {
+                browserLayout?.setPadding(0, 0, 0, 0)
                 child.hide()
             } else {
                 trackers?.let { experimentTrackersCountAnimationHelper.animate(it, siteLiveData) }
                 website?.text = siteLiveData.value?.url?.extractDomain()
                 if (trackersBurstAnimationView?.isAnimating == true) {
                     trackersBurstAnimationView?.cancelAnimation()
                 }
+                browserLayout?.setPadding(0, 0, 0, childHeight)
                 child.show()
             }
             child.postOnAnimation {