show proper omnibar based on flag

Author: malmstein

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatOmnibarLayout.kt

@@ -20,7 +20,6 @@ import android.content.Context
 import android.util.AttributeSet
 import android.widget.FrameLayout
 import com.duckduckgo.anvil.annotations.InjectWith
-import com.duckduckgo.browser.ui.omnibar.OmnibarType
 import com.duckduckgo.browser.ui.tabs.NewTabSwitcherButton
 import com.duckduckgo.di.scopes.FragmentScope
 import com.duckduckgo.duckchat.impl.R
@@ -52,10 +51,6 @@ class DuckChatOmnibarLayout @JvmOverloads constructor(
         inflate(context, R.layout.view_duck_chat_omnibar, this)
 
         AndroidSupportInjection.inject(this)
-
-        val attr = context.theme.obtainStyledAttributes(attrs, R.styleable.DuckChatOmnibarLayout, defStyle, 0)
-        val omnibarType = OmnibarType.entries[attr.getInt(R.styleable.DuckChatOmnibarLayout_duckOmnibarPosition, 0)]
-        val isTopPosition = omnibarType == OmnibarType.SINGLE_TOP || omnibarType == OmnibarType.SPLIT
     }
 
     fun setOmnibarItemPressedListener(itemPressedListener: ItemPressedListener) {

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatWebViewFragment.kt

@@ -39,15 +39,19 @@ import android.webkit.WebView
 import androidx.annotation.AnyThread
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.tabs.BrowserNav
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.common.ui.DuckDuckGoFragment
 import com.duckduckgo.common.ui.view.dialog.ActionBottomSheetDialog
+import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.makeSnackbarWithNoBottomInset
+import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.common.utils.DispatcherProvider
@@ -174,9 +178,6 @@ open class DuckChatWebViewFragment : DuckDuckGoFragment(R.layout.activity_duck_c
         super.onViewCreated(view, savedInstanceState)
 
         val url = arguments?.getString(KEY_DUCK_AI_URL) ?: "https://duckduckgo.com/?q=DuckDuckGo+AI+Chat&ia=chat&duckai=5"
-        val tabs = arguments?.getInt(KEY_DUCK_AI_TABS) ?: 0
-
-        configureOmnibar(tabs)
 
         simpleWebview.let {
             it.webViewClient = webViewClient
@@ -302,7 +303,15 @@ open class DuckChatWebViewFragment : DuckDuckGoFragment(R.layout.activity_duck_c
             pendingUploadTask = null
         }
 
-        // Observe ViewModel commands
+        observeViewModel()
+    }
+
+    private fun observeViewModel() {
+        viewModel.viewState
+            .flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED)
+            .onEach { renderViewState(it) }
+            .launchIn(lifecycleScope)
+
         viewModel.commands
             .onEach { command ->
                 when (command) {
@@ -318,33 +327,58 @@ open class DuckChatWebViewFragment : DuckDuckGoFragment(R.layout.activity_duck_c
             }.launchIn(lifecycleScope)
     }
 
-    private fun configureOmnibar(tabs: Int) {
-        if (false) {
-            toolbar?.let {
-                it.setNavigationIcon(com.duckduckgo.mobile.android.R.drawable.ic_arrow_left_24)
-                it.setNavigationOnClickListener {
-                    requireActivity().onBackPressed()
-                }
-                it.setTitle(R.string.duck_chat_title)
-            }
+    private fun renderViewState(viewState: DuckChatWebViewViewModel.ViewState) {
+        if (viewState.isFullScreenModeEnabled) {
+            configureFullscreenMode()
         } else {
-            duckChatOmnibar?.setOmnibarItemPressedListener(
-                object : DuckChatOmnibarLayout.ItemPressedListener {
-                    override fun onTabsButtonPressed() {
-                        TODO("Not yet implemented")
-                    }
+            configureLegacyMode()
+        }
+    }
 
-                    override fun onFireButtonPressed() {
-                        TODO("Not yet implemented")
-                    }
+    private fun configureLegacyMode() {
+        configureLegacyOmnibar()
+    }
 
-                    override fun onBrowserMenuPressed() {
-                        TODO("Not yet implemented")
-                    }
-                },
-            )
-            duckChatOmnibar?.setTabsCount(tabs)
+    private fun configureFullscreenMode() {
+        configureTabs()
+        configureFullscreenOmnibar()
+    }
+
+    private fun configureTabs() {
+        val tabs = arguments?.getInt(KEY_DUCK_AI_TABS) ?: 0
+        duckChatOmnibar?.setTabsCount(tabs)
+    }
+
+    private fun configureLegacyOmnibar() {
+        toolbar?.let {
+            it.setNavigationIcon(com.duckduckgo.mobile.android.R.drawable.ic_arrow_left_24)
+            it.setNavigationOnClickListener {
+                requireActivity().onBackPressed()
+            }
+            it.setTitle(R.string.duck_chat_title)
         }
+        duckChatOmnibar?.gone()
+    }
+
+    private fun configureFullscreenOmnibar() {
+        root.findViewById<View>(R.id.includeToolbar).gone()
+        duckChatOmnibar?.show()
+
+        duckChatOmnibar?.setOmnibarItemPressedListener(
+            object : DuckChatOmnibarLayout.ItemPressedListener {
+                override fun onTabsButtonPressed() {
+                    Snackbar.make(root, "Tabs", Snackbar.LENGTH_SHORT).show()
+                }
+
+                override fun onFireButtonPressed() {
+                    Snackbar.make(root, "Fire", Snackbar.LENGTH_SHORT).show()
+                }
+
+                override fun onBrowserMenuPressed() {
+                    Snackbar.make(root, "Menu", Snackbar.LENGTH_SHORT).show()
+                }
+            },
+        )
     }
 
     data class FileChooserRequestedParams(

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/ui/DuckChatWebViewViewModel.kt

@@ -20,23 +20,45 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.duckduckgo.anvil.annotations.ContributesViewModel
 import com.duckduckgo.di.scopes.FragmentScope
+import com.duckduckgo.duckchat.impl.DuckChatInternal
+import com.duckduckgo.duckchat.impl.ui.settings.DuckChatSettingsViewModel.ViewState
 import com.duckduckgo.subscriptions.api.Subscriptions
 import kotlinx.coroutines.channels.BufferOverflow.DROP_OLDEST
 import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.stateIn
 import javax.inject.Inject
 
 @ContributesViewModel(FragmentScope::class)
 class DuckChatWebViewViewModel @Inject constructor(
     private val subscriptions: Subscriptions,
+    private val duckChat: DuckChatInternal,
 ) : ViewModel() {
 
     private val commandChannel = Channel<Command>(capacity = 1, onBufferOverflow = DROP_OLDEST)
     val commands = commandChannel.receiveAsFlow()
 
+    data class ViewState(
+        val isDuckChatUserEnabled: Boolean = false,
+        val isFullScreenModeEnabled: Boolean = false,
+    )
+
+    val viewState =
+        combine(
+            duckChat.observeEnableDuckChatUserSetting(),
+            duckChat.observeFullscreenModeUserSetting(),
+        ) { isDuckChatUserEnabled, isFullScreenModeEnabled ->
+            ViewState(
+                isDuckChatUserEnabled = isDuckChatUserEnabled,
+                isFullScreenModeEnabled = isFullScreenModeEnabled,
+            )
+        }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), ViewState())
+
     sealed class Command {
         data object SendSubscriptionAuthUpdateEvent : Command()
     }