Skip to content

Update Input Screen landscape behavior #6898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 7, 2025
Merged

Update Input Screen landscape behavior #6898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76a5b0f
Update Input Screen landscape behavior
joshliebe Oct 6, 2025
4871436
Update to use activityContext
joshliebe Oct 7, 2025
c8efdce
Update tests
joshliebe Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...pl/src/main/java/com/duckduckgo/duckchat/impl/inputscreen/ui/InputScreenConfigResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@

package com.duckduckgo.duckchat.impl.inputscreen.ui

import android.content.Context
import android.content.Intent
import android.content.res.Configuration
import com.duckduckgo.app.di.ActivityContext
import com.duckduckgo.di.scopes.ActivityScope
import com.duckduckgo.duckchat.api.inputscreen.InputScreenActivityParams
import com.duckduckgo.duckchat.impl.DuckChatInternal
Expand All @@ -37,6 +40,7 @@ interface InputScreenConfigResolver {
@SingleInstanceIn(scope = ActivityScope::class)
class InputScreenConfigResolverImpl @Inject constructor(
private val duckChatInternal: DuckChatInternal,
@ActivityContext private val activityContext: Context,
) : InputScreenConfigResolver {
companion object {
fun useTopBar(
Expand All @@ -59,5 +63,5 @@ class InputScreenConfigResolverImpl @Inject constructor(
useTopBar(
isTopOmnibar = isTopOmnibar,
duckChatInternal = duckChatInternal,
)
) || activityContext.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
}
75 changes: 74 additions & 1 deletion .../test/kotlin/com/duckduckgo/duckchat/impl/inputscreen/ui/InputScreenConfigResolverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@

package com.duckduckgo.duckchat.impl.inputscreen.ui

import android.content.Context
import android.content.Intent
import android.content.res.Configuration
import android.content.res.Resources
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.duckduckgo.duckchat.api.inputscreen.InputScreenActivityParams
import com.duckduckgo.duckchat.impl.DuckChatInternal
Expand All @@ -33,13 +36,19 @@ import org.mockito.kotlin.whenever
class InputScreenConfigResolverTest {
private val duckChatInternal: DuckChatInternal = mock()
private val inputScreenBottomBarEnabled = MutableStateFlow(false)
private val mockActivityContext: Context = mock()
private val mockResources: Resources = mock()
private val configuration = Configuration()

private lateinit var inputScreenConfigResolver: InputScreenConfigResolverImpl

@Before
fun setup() {
whenever(duckChatInternal.inputScreenBottomBarEnabled).thenReturn(inputScreenBottomBarEnabled)
inputScreenConfigResolver = InputScreenConfigResolverImpl(duckChatInternal)
whenever(mockActivityContext.resources).thenReturn(mockResources)
whenever(mockResources.configuration).thenReturn(configuration)
configuration.orientation = Configuration.ORIENTATION_PORTRAIT
inputScreenConfigResolver = InputScreenConfigResolverImpl(duckChatInternal, mockActivityContext)
}

@Test
Expand Down Expand Up @@ -118,4 +127,68 @@ class InputScreenConfigResolverTest {

assertFalse(inputScreenConfigResolver.useTopBar())
}

@Test
fun `when landscape and isTopOmnibar true and bottom bar enabled then useTopBar returns true`() {
configuration.orientation = Configuration.ORIENTATION_LANDSCAPE

val intent = Intent().apply {
putExtra(
"ACTIVITY_SERIALIZABLE_PARAMETERS_ARG",
InputScreenActivityParams(query = "", isTopOmnibar = true),
)
}
inputScreenConfigResolver.onInputScreenCreated(intent)
inputScreenBottomBarEnabled.value = true

assertTrue(inputScreenConfigResolver.useTopBar())
}

@Test
fun `when landscape and isTopOmnibar true and bottom bar disabled then useTopBar returns true`() {
configuration.orientation = Configuration.ORIENTATION_LANDSCAPE

val intent = Intent().apply {
putExtra(
"ACTIVITY_SERIALIZABLE_PARAMETERS_ARG",
InputScreenActivityParams(query = "", isTopOmnibar = true),
)
}
inputScreenConfigResolver.onInputScreenCreated(intent)
inputScreenBottomBarEnabled.value = false

assertTrue(inputScreenConfigResolver.useTopBar())
}

@Test
fun `when landscape and isTopOmnibar false and bottom bar enabled then useTopBar returns true`() {
configuration.orientation = Configuration.ORIENTATION_LANDSCAPE

val intent = Intent().apply {
putExtra(
"ACTIVITY_SERIALIZABLE_PARAMETERS_ARG",
InputScreenActivityParams(query = "", isTopOmnibar = false),
)
}
inputScreenConfigResolver.onInputScreenCreated(intent)
inputScreenBottomBarEnabled.value = true

assertTrue(inputScreenConfigResolver.useTopBar())
}

@Test
fun `when landscape and isTopOmnibar false and bottom bar disabled then useTopBar returns true`() {
configuration.orientation = Configuration.ORIENTATION_LANDSCAPE

val intent = Intent().apply {
putExtra(
"ACTIVITY_SERIALIZABLE_PARAMETERS_ARG",
InputScreenActivityParams(query = "", isTopOmnibar = false),
)
}
inputScreenConfigResolver.onInputScreenCreated(intent)
inputScreenBottomBarEnabled.value = false

assertTrue(inputScreenConfigResolver.useTopBar())
}
}
Loading