Skip to content

Commit 4871436

Browse files
committed
Update to use activityContext
1 parent 76a5b0f commit 4871436

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616

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

19+
import android.content.Context
1920
import android.content.Intent
21+
import android.content.res.Configuration
22+
import com.duckduckgo.app.di.ActivityContext
2023
import com.duckduckgo.di.scopes.ActivityScope
2124
import com.duckduckgo.duckchat.api.inputscreen.InputScreenActivityParams
2225
import com.duckduckgo.duckchat.impl.DuckChatInternal
@@ -30,7 +33,7 @@ interface InputScreenConfigResolver {
3033

3134
fun onInputScreenCreated(intent: Intent)
3235

33-
fun useTopBar(isLandscape: Boolean = false): Boolean
36+
fun useTopBar(): Boolean
3437
}
3538

3639
@ContributesBinding(scope = ActivityScope::class)
@@ -45,6 +48,10 @@ class InputScreenConfigResolverImpl @Inject constructor(
4548
): Boolean = isTopOmnibar || !duckChatInternal.inputScreenBottomBarEnabled.value
4649
}
4750

51+
@Inject
52+
@ActivityContext
53+
lateinit var activityContext: Context
54+
4855
private var _isTopOmnibar = true
4956

5057
override val isTopOmnibar: Boolean
@@ -55,9 +62,9 @@ class InputScreenConfigResolverImpl @Inject constructor(
5562
_isTopOmnibar = params?.isTopOmnibar ?: true
5663
}
5764

58-
override fun useTopBar(isLandscape: Boolean): Boolean =
65+
override fun useTopBar(): Boolean =
5966
useTopBar(
60-
isTopOmnibar = isTopOmnibar || isLandscape,
67+
isTopOmnibar = isTopOmnibar,
6168
duckChatInternal = duckChatInternal,
62-
)
69+
) || activityContext.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
6370
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package com.duckduckgo.duckchat.impl.inputscreen.ui
1919
import android.animation.ValueAnimator
2020
import android.app.Activity
2121
import android.content.Intent
22-
import android.content.res.Configuration
2322
import android.os.Bundle
2423
import android.util.TypedValue
2524
import android.view.Gravity
@@ -155,8 +154,7 @@ class InputScreenFragment : DuckDuckGoFragment(R.layout.fragment_input_screen) {
155154
inputModeWidget.provideInitialText(query)
156155
}
157156

158-
val isLandscape = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
159-
val useTopBar = inputScreenConfigResolver.useTopBar(isLandscape)
157+
val useTopBar = inputScreenConfigResolver.useTopBar()
160158
val separatorHeightPx = resources.getDimensionPixelSize(R.dimen.inputScreenContentSeparatorHeight)
161159
contentSeparator =
162160
View(context).apply {

0 commit comments

Comments
 (0)