Fix the omnibar initialization

Author: 0nko

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

@@ -73,60 +73,47 @@ class Omnibar(
     private val binding: FragmentBrowserTabBinding,
     isUnifiedOmnibarEnabled: Boolean,
 ) {
-    init {
+
+    val omnibarView: OmnibarView by lazy {
         if (isUnifiedOmnibarEnabled) {
             setupUnifiedOmnibar()
         } else {
             setupSingleOmnibar()
         }
     }
 
-    private fun setupSingleOmnibar() {
+    private fun setupSingleOmnibar(): OmnibarView {
         binding.rootView.removeView(binding.unifiedOmnibarLayoutTop)
         binding.rootView.removeView(binding.unifiedOmnibarLayoutBottom)
 
-        when (omnibarPosition) {
+        return when (omnibarPosition) {
             OmnibarPosition.TOP -> {
-                // remove bottom variant
                 binding.rootView.removeView(binding.singleOmnibarLayoutBottom)
+                binding.singleOmnibarLayoutTop
             }
 
             OmnibarPosition.BOTTOM -> {
-                // remove top variant
                 binding.rootView.removeView(binding.singleOmnibarLayoutTop)
-
                 adjustCoordinatorLayoutBehaviorForBottomOmnibar()
+                binding.singleOmnibarLayoutBottom
             }
         }
     }
 
-    private fun setupUnifiedOmnibar() {
+    private fun setupUnifiedOmnibar(): OmnibarView {
         binding.rootView.removeView(binding.singleOmnibarLayoutTop)
         binding.rootView.removeView(binding.singleOmnibarLayoutBottom)
 
-        when (omnibarPosition) {
+        return when (omnibarPosition) {
             OmnibarPosition.TOP -> {
-                // remove bottom variant
                 binding.rootView.removeView(binding.unifiedOmnibarLayoutBottom)
+                binding.unifiedOmnibarLayoutTop
             }
 
             OmnibarPosition.BOTTOM -> {
-                // remove top variant
                 binding.rootView.removeView(binding.unifiedOmnibarLayoutTop)
-
                 adjustCoordinatorLayoutBehaviorForBottomOmnibar()
-            }
-        }
-    }
-
-    val omnibarView: OmnibarView by lazy {
-        when (omnibarPosition) {
-            OmnibarPosition.TOP -> {
-                binding.singleOmnibarLayoutTop
-            }
-
-            OmnibarPosition.BOTTOM -> {
-                binding.singleOmnibarLayoutBottom
+                binding.unifiedOmnibarLayoutBottom
             }
         }
     }