@@ -27,6 +27,8 @@ import android.view.View
27
27
import androidx.activity.OnBackPressedCallback
28
28
import androidx.appcompat.app.AppCompatDelegate.FEATURE_SUPPORT_ACTION_BAR
29
29
import androidx.appcompat.widget.Toolbar
30
+ import androidx.coordinatorlayout.widget.CoordinatorLayout
31
+ import androidx.core.view.updateLayoutParams
30
32
import androidx.lifecycle.Lifecycle
31
33
import androidx.lifecycle.flowWithLifecycle
32
34
import androidx.lifecycle.lifecycleScope
@@ -41,6 +43,7 @@ import com.duckduckgo.app.browser.R
41
43
import com.duckduckgo.app.browser.databinding.ActivityTabSwitcherBinding
42
44
import com.duckduckgo.app.browser.databinding.PopupTabsMenuBinding
43
45
import com.duckduckgo.app.browser.favicon.FaviconManager
46
+ import com.duckduckgo.app.browser.omnibar.model.OmnibarPosition
44
47
import com.duckduckgo.app.browser.tabpreview.WebViewPreviewPersister
45
48
import com.duckduckgo.app.di.AppCoroutineScope
46
49
import com.duckduckgo.app.downloads.DownloadsActivity
@@ -89,6 +92,7 @@ import com.duckduckgo.common.ui.view.gone
89
92
import com.duckduckgo.common.ui.view.hide
90
93
import com.duckduckgo.common.ui.view.show
91
94
import com.duckduckgo.common.ui.view.toDp
95
+ import com.duckduckgo.common.ui.view.toPx
92
96
import com.duckduckgo.common.ui.viewbinding.viewBinding
93
97
import com.duckduckgo.common.utils.DispatcherProvider
94
98
import com.duckduckgo.di.scopes.ActivityScope
@@ -268,6 +272,13 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
268
272
269
273
private fun configureViewReferences () {
270
274
tabsRecycler = findViewById(R .id.tabsRecycler)
275
+
276
+ if (settingsDataStore.omnibarPosition == OmnibarPosition .BOTTOM && viewModel.isNewDesignEnabled) {
277
+ binding.root.removeView(binding.tabSwitcherToolbarTop.root)
278
+ } else {
279
+ binding.root.removeView(binding.tabSwitcherToolbarBottom.root)
280
+ }
281
+
271
282
toolbar = findViewById(R .id.toolbar)
272
283
}
273
284
@@ -298,6 +309,19 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
298
309
handleFabStateUpdates()
299
310
handleSelectionModeCancellation()
300
311
}
312
+
313
+ if (viewModel.isNewDesignEnabled) {
314
+ // Set the layout params for the tabs recycler view based on omnibar position
315
+ tabsRecycler.updateLayoutParams {
316
+ this as CoordinatorLayout .LayoutParams
317
+ this .behavior = null
318
+ if (settingsDataStore.omnibarPosition == OmnibarPosition .TOP ) {
319
+ this .topMargin = 56 .toPx()
320
+ } else {
321
+ this .bottomMargin = 56 .toPx()
322
+ }
323
+ }
324
+ }
301
325
}
302
326
303
327
private fun handleSelectionModeCancellation () {
0 commit comments