address pr comments

Author: malmstein

app/build.gradle

@@ -18,8 +18,7 @@ ext {
 
 android {
     defaultConfig {
-//        applicationId "com.duckduckgo.mobile.android"
-        applicationId "com.duckduckgo.mobile.android.duckai.poc"
+        applicationId "com.duckduckgo.mobile.android"
 
         minSdk min_sdk
         targetSdk target_sdk
@@ -141,8 +140,8 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             manifestPlaceholders = [
-                    appIcon     : "@mipmap/ic_launcher_purple",
-                    appIconRound: "@mipmap/ic_launcher_purple_round"
+                    appIcon     : "@mipmap/ic_launcher_red",
+                    appIconRound: "@mipmap/ic_launcher_red_round"
             ]
 
             if (project.hasProperty('useUploadSigning')) {

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

@@ -350,8 +350,8 @@ open class DuckChatWebViewFragment : DuckDuckGoFragment(R.layout.activity_duck_c
     }
 
     private fun configureLegacyOmnibar() {
-        root.findViewById<View>(R.id.includeToolbar).show()
         toolbar?.let {
+            it.show()
             it.setNavigationIcon(com.duckduckgo.mobile.android.R.drawable.ic_arrow_left_24)
             it.setNavigationOnClickListener {
                 requireActivity().onBackPressed()
@@ -362,7 +362,7 @@ open class DuckChatWebViewFragment : DuckDuckGoFragment(R.layout.activity_duck_c
     }
 
     private fun configureFullscreenOmnibar() {
-        root.findViewById<View>(R.id.includeToolbar).gone()
+        toolbar?.gone()
         duckChatOmnibar?.show()
 
         duckChatOmnibar?.setOmnibarItemPressedListener(

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
@@ -44,20 +44,18 @@ class DuckChatWebViewViewModel @Inject constructor(
     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())
+    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(),
+        )
 
     sealed class Command {
         data object SendSubscriptionAuthUpdateEvent : Command()

duckchat/duckchat-impl/src/main/res/values/attrs-omnibar-view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2022 DuckDuckGo
+  ~ Copyright (c) 2025 DuckDuckGo
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

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

@@ -54,7 +54,6 @@ class DuckChatWebViewViewModelTest {
     @Before
     fun setup() {
         whenever(subscriptions.getSubscriptionStatusFlow()).thenReturn(subscriptionStatusFlow)
-        whenever(duckChat.observeEnableDuckChatUserSetting()).thenReturn(flowOf(true))
         whenever(duckChat.observeFullscreenModeUserSetting()).thenReturn(flowOf(true))
         viewModel = DuckChatWebViewViewModel(subscriptions, duckChat)
     }
@@ -145,7 +144,6 @@ class DuckChatWebViewViewModelTest {
     @Test
     fun `fullscreen mode - when flags enabled, then viewstate enabled`() =
         runTest {
-            whenever(duckChat.observeEnableDuckChatUserSetting()).thenReturn(flowOf(true))
             whenever(duckChat.observeFullscreenModeUserSetting()).thenReturn(flowOf(true))
             viewModel = DuckChatWebViewViewModel(
                 subscriptions,
@@ -154,15 +152,13 @@ class DuckChatWebViewViewModelTest {
 
             viewModel.viewState.test {
                 val state = awaitItem()
-                assertTrue(state.isDuckChatUserEnabled)
                 assertTrue(state.isFullScreenModeEnabled)
             }
         }
 
     @Test
     fun `fullscreen mode - when flags disabled, then viewstate disabled`() =
         runTest {
-            whenever(duckChat.observeEnableDuckChatUserSetting()).thenReturn(flowOf(false))
             whenever(duckChat.observeFullscreenModeUserSetting()).thenReturn(flowOf(false))
             viewModel = DuckChatWebViewViewModel(
                 subscriptions,
@@ -171,7 +167,6 @@ class DuckChatWebViewViewModelTest {
 
             viewModel.viewState.test {
                 val state = awaitItem()
-                assertFalse(state.isDuckChatUserEnabled)
                 assertFalse(state.isFullScreenModeEnabled)
             }
         }