Skip to content

Commit 9f4be4f

Browse files
authored
fix string used for rebranded Duck.ai setting sub-title (#6553)
Task/Issue URL: https://app.asana.com/1/137249556945/project/488551667048375/task/1211006141204529?focus=true ### Description Fixes the rebranded Duck.ai settings sub-title and fixes "Learn More" link for both variants. ### Steps to test this PR - [x] Ensure you have the "subscriptionAIFeaturesRebranding" feature flag enabled. - [x] Verify the sub-title text in "AI settings" matches the copy and "Learn More" link is clickable. - [x] Disable "subscriptionAIFeaturesRebranding" feature flag. - [x] Verify the sub-title text in "Duck.ai settings" matches the copy and "Learn More" link is clickable. ### UI changes See Asana task.
1 parent 7efec12 commit 9f4be4f

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,6 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
8686

8787
setContentView(binding.root)
8888

89-
binding.duckChatSettingsText.addClickableSpan(
90-
textSequence = getText(R.string.duck_chat_settings_activity_description),
91-
spans = listOf(
92-
"learn_more_link" to object : DuckDuckGoClickableSpan() {
93-
override fun onClick(widget: View) {
94-
viewModel.duckChatLearnMoreClicked()
95-
}
96-
},
97-
),
98-
)
99-
10089
setupToolbar(binding.includeToolbar.toolbar)
10190

10291
observeViewModel()
@@ -120,7 +109,6 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
120109
if (viewState.isRebrandingAiFeaturesEnabled) {
121110
binding.userEnabledDuckChatToggleRebranding.quietlySetIsChecked(viewState.isDuckChatUserEnabled, userEnabledDuckChatToggleListener)
122111
binding.duckChatSettingsTitle.setText(R.string.duck_chat_title_rebranding)
123-
binding.duckChatToggleSettingsTitle.setText(R.string.duck_chat_settings_activity_description_rebranding)
124112
binding.userEnabledDuckChatToggle.gone()
125113
binding.userEnabledDuckChatToggleRebranding.show()
126114
binding.duckChatToggleSettingsTitle.setText(R.string.duck_chat_show_in_heading_rebranding)
@@ -129,14 +117,28 @@ class DuckChatSettingsActivity : DuckDuckGoActivity() {
129117
} else {
130118
binding.userEnabledDuckChatToggle.quietlySetIsChecked(viewState.isDuckChatUserEnabled, userEnabledDuckChatToggleListener)
131119
binding.duckChatSettingsTitle.setText(R.string.duck_chat_title)
132-
binding.duckChatSettingsText.setText(R.string.duck_chat_settings_activity_description)
133120
binding.userEnabledDuckChatToggle.show()
134121
binding.userEnabledDuckChatToggleRebranding.gone()
135122
binding.duckChatToggleSettingsTitle.setText(R.string.duck_chat_show_in_heading)
136123
binding.showDuckChatSearchSettingsLink.setPrimaryText(getString(R.string.duck_chat_assist_settings_title))
137124
binding.showDuckChatSearchSettingsLink.setSecondaryText(getString(R.string.duck_chat_assist_settings_description))
138125
}
139126

127+
binding.duckChatSettingsText.addClickableSpan(
128+
textSequence = if (viewState.isRebrandingAiFeaturesEnabled) {
129+
getText(R.string.duck_chat_settings_activity_description_rebranding)
130+
} else {
131+
getText(R.string.duck_chat_settings_activity_description)
132+
},
133+
spans = listOf(
134+
"learn_more_link" to object : DuckDuckGoClickableSpan() {
135+
override fun onClick(widget: View) {
136+
viewModel.duckChatLearnMoreClicked()
137+
}
138+
},
139+
),
140+
)
141+
140142
binding.duckAiInputScreenEnabledToggle.apply {
141143
isVisible = viewState.shouldShowInputScreenToggle
142144
quietlySetIsChecked(viewState.isInputScreenEnabled, inputScreenToggleListener)

0 commit comments

Comments
 (0)