nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

[fenix] For https://github.com/mozilla-mobile/fenix/issues/25894 - Add firefox suggest header for lib suggestions

Browse source
This commit is contained in:
sarah541 2022-07-06 17:53:40 -04:00 committed by mergify[bot]
parent 225b5d3506
commit 1799379990
3 changed files with 13 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

15
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
View file

@ -107,7 +107,8 @@ class AwesomeBarView(
selectTabUseCase, selectTabUseCase,
components.core.icons, components.core.icons,
getDrawable(activity, R.drawable.ic_search_results_tab), getDrawable(activity, R.drawable.ic_search_results_tab),
excludeSelectedSession = !fromHomeFragment excludeSelectedSession = !fromHomeFragment,
suggestionsHeader = activity.getString(R.string.firefox_suggest_header),
) )
historyStorageProvider = historyStorageProvider =
@ -115,7 +116,8 @@ class AwesomeBarView(
components.core.historyStorage, components.core.historyStorage,
loadUrlUseCase, loadUrlUseCase,
components.core.icons, components.core.icons,
engineForSpeculativeConnects engineForSpeculativeConnects,
suggestionsHeader = activity.getString(R.string.firefox_suggest_header),
) )
combinedHistoryProvider = combinedHistoryProvider =
@ -125,7 +127,8 @@ class AwesomeBarView(
loadUrlUseCase = loadUrlUseCase, loadUrlUseCase = loadUrlUseCase,
icons = components.core.icons, icons = components.core.icons,
engine = engineForSpeculativeConnects, engine = engineForSpeculativeConnects,
maxNumberOfSuggestions = METADATA_SUGGESTION_LIMIT maxNumberOfSuggestions = METADATA_SUGGESTION_LIMIT,
suggestionsHeader = activity.getString(R.string.firefox_suggest_header),
) )
bookmarksStorageSuggestionProvider = bookmarksStorageSuggestionProvider =
@ -134,7 +137,8 @@ class AwesomeBarView(
loadUrlUseCase = loadUrlUseCase, loadUrlUseCase = loadUrlUseCase,
icons = components.core.icons, icons = components.core.icons,
indicatorIcon = getDrawable(activity, R.drawable.ic_search_results_bookmarks), indicatorIcon = getDrawable(activity, R.drawable.ic_search_results_bookmarks),
engine = engineForSpeculativeConnects engine = engineForSpeculativeConnects,
suggestionsHeader = activity.getString(R.string.firefox_suggest_header),
) )
syncedTabsStorageSuggestionProvider = syncedTabsStorageSuggestionProvider =
@ -146,7 +150,8 @@ class AwesomeBarView(
getDrawable(activity, R.drawable.ic_search_results_device_desktop), getDrawable(activity, R.drawable.ic_search_results_device_desktop),
getDrawable(activity, R.drawable.ic_search_results_device_mobile), getDrawable(activity, R.drawable.ic_search_results_device_mobile),
getDrawable(activity, R.drawable.ic_search_results_device_tablet) getDrawable(activity, R.drawable.ic_search_results_device_tablet)
) ),
suggestionsHeader = activity.getString(R.string.firefox_suggest_header),
) )
val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply { val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply {

3
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarWrapper.kt
View file

@ -57,7 +57,8 @@ class AwesomeBarWrapper @JvmOverloads constructor(
background = Color.Transparent, background = Color.Transparent,
title = ThemeManager.resolveAttributeColor(R.attr.textPrimary), title = ThemeManager.resolveAttributeColor(R.attr.textPrimary),
description = ThemeManager.resolveAttributeColor(R.attr.textSecondary), description = ThemeManager.resolveAttributeColor(R.attr.textSecondary),
autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.textSecondary) autocompleteIcon = ThemeManager.resolveAttributeColor(R.attr.textSecondary),
groupTitle = ThemeManager.resolveAttributeColor(R.attr.textSecondary),
), ),
onSuggestionClicked = { suggestion -> onSuggestionClicked = { suggestion ->
suggestion.onSuggestionClicked?.invoke() suggestion.onSuggestionClicked?.invoke()

1
mobile/android/fenix/app/src/main/res/values/strings.xml
View file

@ -1787,4 +1787,5 @@
<string name="experiments_snackbar">Enable telemetry to send data.</string> <string name="experiments_snackbar">Enable telemetry to send data.</string>
<!-- Snackbar button text to navigate to telemetry settings.--> <!-- Snackbar button text to navigate to telemetry settings.-->
<string name="experiments_snackbar_button">Go to settings</string> <string name="experiments_snackbar_button">Go to settings</string>
<string name="firefox_suggest_header">Firefox Suggest</string>
</resources> </resources>