only enable fullscreen mode is the toggle is enabled for now

Author: malmstein

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

@@ -2982,7 +2982,6 @@ class BrowserTabViewModel @Inject constructor(
                 duckAiFeatureState.showInputScreen.value || currentBrowserViewState().lastQueryOrigin == QueryOrigin.FromBookmark ||
                 (settingsDataStore.omnibarType == OmnibarType.SPLIT && alreadyShownKeyboard)
 
-        logcat { "Duck.ai: fullscreenEnabled: ${duckAiFeatureState.isFullScreenModeEnabled.value}" }
         logcat { "Duck.ai: shouldHideKeyboard: $shouldHideKeyboard" }
 
         command.value = if (shouldHideKeyboard) {

duckchat/duckchat-api/src/main/java/com/duckduckgo/duckchat/api/DuckAiFeatureState.kt

@@ -68,9 +68,4 @@ interface DuckAiFeatureState {
      * Indicates whether the Input Mode toggle should be shown in the voice search screen.
      */
     val showVoiceSearchToggle: StateFlow<Boolean>
-
-    /**
-     * Indicates whether Duck.ai fullscreen is enabled but the feature flag and the user selection
-     */
-    val isFullScreenModeEnabled: StateFlow<Boolean>
 }

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/RealDuckChat.kt

@@ -287,7 +287,6 @@ class RealDuckChat @Inject constructor(
     private val _showNewAddressBarOptionChoiceScreen = MutableStateFlow(false)
     private val _showClearDuckAIChatHistory = MutableStateFlow(true)
     private val _showMainButtonsInInputScreen = MutableStateFlow(false)
-    private val _fullscreenModeEnabled = MutableStateFlow(false)
 
     private val _chatState = MutableStateFlow(ChatState.HIDE)
     private val keepSession = MutableStateFlow(false)
@@ -449,8 +448,6 @@ class RealDuckChat @Inject constructor(
 
     override val showVoiceSearchToggle: StateFlow<Boolean> = _showVoiceSearchToggle.asStateFlow()
 
-    override val isFullScreenModeEnabled: StateFlow<Boolean> = _fullscreenModeEnabled
-
     override val chatState: StateFlow<ChatState> = _chatState.asStateFlow()
 
     override fun isImageUploadEnabled(): Boolean = isImageUploadEnabled
@@ -728,9 +725,6 @@ class RealDuckChat @Inject constructor(
             val showClearChatHistory = clearChatHistory
             _showClearDuckAIChatHistory.emit(showClearChatHistory)
 
-            val fullscreenModeEnabled = isFullscreenModeEnabled && duckChatFeatureRepository.isFullScreenModeUserSettingEnabled()
-            _fullscreenModeEnabled.emit(fullscreenModeEnabled)
-
             val showVoiceSearchToggle =
                 duckChatFeatureRepository.shouldShowInVoiceSearch() &&
                     isDuckChatFeatureEnabled && isDuckChatUserEnabled && isVoiceSearchEntryPointEnabled

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

@@ -26,9 +26,9 @@ 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.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.stateIn
@@ -47,15 +47,15 @@ class DuckChatWebViewViewModel @Inject constructor(
         val isFullScreenModeEnabled: Boolean = false,
     )
 
-    val viewState = duckChat.observeFullscreenModeUserSetting()
-        .map { isFullScreenModeEnabled ->
-            ViewState(isFullScreenModeEnabled = isFullScreenModeEnabled)
-        }
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(), // Using a 5-second timeout is best practice
-            initialValue = ViewState(),
-        )
+    val viewState =
+        combine(
+            duckChat.observeInputScreenUserSettingEnabled(),
+            duckChat.observeFullscreenModeUserSetting(),
+        ) { isInputScreenEnabled, isFullScreenModeEnabled ->
+            ViewState(
+                isFullScreenModeEnabled = isFullScreenModeEnabled && isInputScreenEnabled,
+            )
+        }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), ViewState())
 
     sealed class Command {
         data object SendSubscriptionAuthUpdateEvent : Command()

duckchat/duckchat-impl/src/test/java/com/duckduckgo/duckchat/impl/ui/DuckChatWebViewViewModelTest.kt

@@ -144,6 +144,7 @@ class DuckChatWebViewViewModelTest {
     @Test
     fun `fullscreen mode - when flags enabled, then viewstate enabled`() =
         runTest {
+            whenever(duckChat.observeInputScreenUserSettingEnabled()).thenReturn(flowOf(true))
             whenever(duckChat.observeFullscreenModeUserSetting()).thenReturn(flowOf(true))
             viewModel = DuckChatWebViewViewModel(
                 subscriptions,
@@ -159,12 +160,29 @@ class DuckChatWebViewViewModelTest {
     @Test
     fun `fullscreen mode - when flags disabled, then viewstate disabled`() =
         runTest {
+            whenever(duckChat.observeInputScreenUserSettingEnabled()).thenReturn(flowOf(true))
             whenever(duckChat.observeFullscreenModeUserSetting()).thenReturn(flowOf(false))
             viewModel = DuckChatWebViewViewModel(
                 subscriptions,
                 duckChat = duckChat,
             )
 
+            viewModel.viewState.test {
+                val state = awaitItem()
+                assertFalse(state.isFullScreenModeEnabled)
+            }
+        }
+
+    @Test
+    fun `fullscreen mode - when input scree disabled, then viewstate disabled`() =
+        runTest {
+            whenever(duckChat.observeInputScreenUserSettingEnabled()).thenReturn(flowOf(false))
+            whenever(duckChat.observeFullscreenModeUserSetting()).thenReturn(flowOf(true))
+            viewModel = DuckChatWebViewViewModel(
+                subscriptions,
+                duckChat = duckChat,
+            )
+
             viewModel.viewState.test {
                 val state = awaitItem()
                 assertFalse(state.isFullScreenModeEnabled)