From 9a56dcd786c1b1e95ba6f205c290fc6bab45c9f9 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Mon, 24 Aug 2020 19:44:21 -0700 Subject: [PATCH] For #13784 - Addresses nits --- .../mozilla/fenix/search/SearchFragment.kt | 2 +- .../searchdialog/SearchDialogFragment.kt | 29 ++++++++++--------- app/src/main/res/layout/fragment_search.xml | 2 +- .../res/layout/fragment_search_dialog.xml | 10 +++---- ...arding.xml => search_suggestions_hint.xml} | 0 app/src/main/res/values/styles.xml | 1 - 6 files changed, 22 insertions(+), 22 deletions(-) rename app/src/main/res/layout/{search_suggestions_onboarding.xml => search_suggestions_hint.xml} (100%) diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt index d407a8d91..955dc0844 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt @@ -28,7 +28,7 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import kotlinx.android.synthetic.main.fragment_search.* import kotlinx.android.synthetic.main.fragment_search.view.* -import kotlinx.android.synthetic.main.search_suggestions_onboarding.view.* +import kotlinx.android.synthetic.main.search_suggestions_hint.view.* import kotlinx.coroutines.ExperimentalCoroutinesApi import mozilla.components.browser.toolbar.BrowserToolbar import mozilla.components.concept.storage.HistoryStorage diff --git a/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt index 0068fb7c4..d62d012e3 100644 --- a/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt @@ -33,7 +33,7 @@ import kotlinx.android.synthetic.main.fragment_search_dialog.pill_wrapper import kotlinx.android.synthetic.main.fragment_search_dialog.qr_scan_button import kotlinx.android.synthetic.main.fragment_search_dialog.toolbar import kotlinx.android.synthetic.main.fragment_search_dialog.view.* -import kotlinx.android.synthetic.main.search_suggestions_onboarding.view.* +import kotlinx.android.synthetic.main.search_suggestions_hint.view.* import kotlinx.coroutines.ExperimentalCoroutinesApi import mozilla.components.browser.toolbar.BrowserToolbar import mozilla.components.feature.qr.QrFeature @@ -161,6 +161,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { } @ExperimentalCoroutinesApi + @SuppressWarnings("LongMethod") override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) @@ -214,8 +215,10 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { inflated.allow.setOnClickListener { inflated.visibility = View.GONE - context?.settings()?.shouldShowSearchSuggestionsInPrivate = true - context?.settings()?.showSearchSuggestionsInPrivateOnboardingFinished = true + requireContext().settings().also { + it.shouldShowSearchSuggestionsInPrivate = true + it.showSearchSuggestionsInPrivateOnboardingFinished = true + } store.dispatch(SearchFragmentAction.SetShowSearchSuggestions(true)) store.dispatch(SearchFragmentAction.AllowSearchSuggestionsInPrivateModePrompt(false)) requireComponents.analytics.metrics.track(Event.PrivateBrowsingShowSearchSuggestions) @@ -223,8 +226,10 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { inflated.dismiss.setOnClickListener { inflated.visibility = View.GONE - context?.settings()?.shouldShowSearchSuggestionsInPrivate = false - context?.settings()?.showSearchSuggestionsInPrivateOnboardingFinished = true + requireContext().settings().also { + it.shouldShowSearchSuggestionsInPrivate = false + it.showSearchSuggestionsInPrivateOnboardingFinished = true + } } inflated.text.text = @@ -234,7 +239,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { getString(R.string.search_suggestions_onboarding_title) } - view.search_suggestions_onboarding.setOnInflateListener((stubListener)) + view.search_suggestions_hint.setOnInflateListener((stubListener)) consumeFrom(store) { val shouldShowAwesomebar = @@ -339,8 +344,8 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { private fun updateSearchSuggestionsHintVisibility(state: SearchFragmentState) { view?.apply { - findViewById(R.id.search_suggestions_onboarding)?.isVisible = state.showSearchSuggestionsHint - search_suggestions_onboarding_divider?.isVisible = state.showSearchSuggestionsHint + findViewById(R.id.search_suggestions_hint)?.isVisible = state.showSearchSuggestionsHint + search_suggestions_hint_divider?.isVisible = state.showSearchSuggestionsHint } } @@ -386,16 +391,12 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { } private fun updateClipboardSuggestion(searchState: SearchFragmentState, clipboardUrl: String?) { - val visibility = - if ( - searchState.showClipboardSuggestions && + val shouldShowView = searchState.showClipboardSuggestions && searchState.query.isEmpty() && !clipboardUrl.isNullOrEmpty() && !searchState.showSearchShortcuts - ) - View.VISIBLE else View.GONE - fill_link_from_clipboard.visibility = visibility + fill_link_from_clipboard.visibility = if (shouldShowView) View.VISIBLE else View.GONE clipboard_url.text = clipboardUrl if (clipboardUrl != null && !((activity as HomeActivity).browsingModeManager.mode.isPrivate)) { diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index d85e21d64..6a7e8be88 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -63,7 +63,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inflatedId="@id/search_suggestions_onboarding" - android:layout="@layout/search_suggestions_onboarding" + android:layout="@layout/search_suggestions_hint" app:layout_constraintBottom_toTopOf="@id/awesomeBar_barrier" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_search_dialog.xml b/app/src/main/res/layout/fragment_search_dialog.xml index 7e2592d03..6a6686f05 100644 --- a/app/src/main/res/layout/fragment_search_dialog.xml +++ b/app/src/main/res/layout/fragment_search_dialog.xml @@ -48,22 +48,22 @@ mozac:awesomeBarTitleTextColor="?primaryText" /> diff --git a/app/src/main/res/layout/search_suggestions_onboarding.xml b/app/src/main/res/layout/search_suggestions_hint.xml similarity index 100% rename from app/src/main/res/layout/search_suggestions_onboarding.xml rename to app/src/main/res/layout/search_suggestions_hint.xml diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 464ead806..05dc9426b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -621,7 +621,6 @@ ?accentHighContrast ?accentHighContrast ?accentBright - @android:color/transparent true false