add duck.ai omnibar

Author: malmstein

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

@@ -111,6 +111,7 @@ import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.duckchat.api.DuckAiFeatureState
 import com.duckduckgo.duckchat.api.DuckChat
 import com.duckduckgo.duckchat.impl.ui.DuckChatWebViewFragment
+import com.duckduckgo.duckchat.impl.ui.DuckChatWebViewFragment.Companion.KEY_DUCK_AI_TABS
 import com.duckduckgo.duckchat.impl.ui.DuckChatWebViewFragment.Companion.KEY_DUCK_AI_URL
 import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.duckduckgo.savedsites.impl.bookmarks.BookmarksActivity.Companion.SAVED_SITE_URL_EXTRA
@@ -753,7 +754,7 @@ open class BrowserActivity : DuckDuckGoActivity() {
             is Command.ShowSystemDefaultAppsActivity -> showSystemDefaultAppsActivity(command.intent)
             is Command.ShowSystemDefaultBrowserDialog -> showSystemDefaultBrowserDialog(command.intent)
             is Command.ShowUndoDeleteTabsMessage -> showTabsDeletedSnackbar(command.tabIds)
-            is Command.OpenDuckChat -> openDuckChat(command.duckChatUrl, command.duckChatSessionActive, command.withTransition)
+            is Command.OpenDuckChat -> openDuckChat(command.duckChatUrl, command.duckChatSessionActive, command.withTransition, command.tabs)
             Command.LaunchTabSwitcher -> currentTab?.launchTabSwitcherAfterTabsUndeleted()
         }
     }
@@ -856,15 +857,16 @@ open class BrowserActivity : DuckDuckGoActivity() {
         url: String?,
         duckChatSessionActive: Boolean,
         withTransition: Boolean,
+        tabs: Int,
     ) {
         duckAiFragment?.let { fragment ->
             if (duckChatSessionActive) {
                 restoreDuckChat(fragment, withTransition)
             } else {
-                launchNewDuckChat(url, withTransition)
+                launchNewDuckChat(url, withTransition, tabs)
             }
         } ?: run {
-            launchNewDuckChat(url, withTransition)
+            launchNewDuckChat(url, withTransition, tabs)
         }
 
         currentTab?.getOmnibar()?.omnibarView?.omnibarTextInput?.let {
@@ -875,6 +877,7 @@ open class BrowserActivity : DuckDuckGoActivity() {
     private fun launchNewDuckChat(
         duckChatUrl: String?,
         withTransition: Boolean,
+        tabs: Int,
     ) {
         val wasFragmentVisible = duckAiFragment?.isVisible ?: false
         val fragment =
@@ -883,6 +886,7 @@ open class BrowserActivity : DuckDuckGoActivity() {
                     arguments =
                         Bundle().apply {
                             putString(KEY_DUCK_AI_URL, duckChatUrl)
+                            putInt(KEY_DUCK_AI_TABS, tabs)
                         }
                 }
             }

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

@@ -133,7 +133,7 @@ class BrowserViewModel @Inject constructor(
         data class ShowSystemDefaultBrowserDialog(val intent: Intent) : Command()
         data class ShowSystemDefaultAppsActivity(val intent: Intent) : Command()
         data class ShowUndoDeleteTabsMessage(val tabIds: List<String>) : Command()
-        data class OpenDuckChat(val duckChatUrl: String?, val duckChatSessionActive: Boolean, val withTransition: Boolean) : Command()
+        data class OpenDuckChat(val duckChatUrl: String?, val duckChatSessionActive: Boolean, val withTransition: Boolean, val tabs: Int) : Command()
     }
 
     var viewState: MutableLiveData<ViewState> = MutableLiveData<ViewState>().also {
@@ -464,7 +464,7 @@ class BrowserViewModel @Inject constructor(
 
     fun openDuckChat(duckChatUrl: String?, duckChatSessionActive: Boolean, withTransition: Boolean) {
         logcat(INFO) { "Duck.ai openDuckChat duckChatSessionActive $duckChatSessionActive" }
-        command.value = OpenDuckChat(duckChatUrl, duckChatSessionActive, withTransition)
+        command.value = OpenDuckChat(duckChatUrl, duckChatSessionActive, withTransition, tabs.value.size)
     }
 }
 

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

@@ -163,6 +163,7 @@ open class DuckChatWebViewFragment : DuckDuckGoFragment(R.layout.activity_duck_c
 
     // private val toolbar: Toolbar? by lazy { binding.includeToolbar.toolbar }
     internal val simpleWebview: WebView by lazy { binding.simpleWebview }
+    internal val tabSwitcher by lazy { binding.inputFieldTabsMenu }
 
     @SuppressLint("SetJavaScriptEnabled")
     override fun onViewCreated(
@@ -180,6 +181,7 @@ open class DuckChatWebViewFragment : DuckDuckGoFragment(R.layout.activity_duck_c
         // }
 
         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
 
         simpleWebview.let {
             it.webViewClient = webViewClient
@@ -305,6 +307,8 @@ open class DuckChatWebViewFragment : DuckDuckGoFragment(R.layout.activity_duck_c
             pendingUploadTask = null
         }
 
+        tabSwitcher.count = tabs
+
         // Observe ViewModel commands
         viewModel.commands
             .onEach { command ->
@@ -604,6 +608,6 @@ open class DuckChatWebViewFragment : DuckDuckGoFragment(R.layout.activity_duck_c
             "Mozilla/5.0 (Linux; Android 16) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/124.0.0.0 Mobile DuckDuckGo/5 Safari/537.36"
         private const val REQUEST_CODE_CHOOSE_FILE = 100
         const val KEY_DUCK_AI_URL: String = "KEY_DUCK_AI_URL"
-        const val KEY_DUCK_AI_URL: String = "KEY_TABS_URL"
+        const val KEY_DUCK_AI_TABS: String = "KEY_DUCK_AI_TABS"
     }
 }

duckchat/duckchat-impl/src/main/res/layout/activity_duck_chat_webview.xml

@@ -28,7 +28,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:layout_marginStart="@dimen/omnibarCardMarginHorizontal"
-        android:layout_marginTop="@dimen/omnibarCardMarginBottom"
+        android:paddingTop="2dp"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -40,6 +40,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:cardElevation="0dp"
+            android:layout_marginTop="2dp"
             app:layout_constraintEnd_toStartOf="@id/inputModeMainButtonsContainer"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"