diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java index 18c60400b47..fa166909320 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java @@ -219,6 +219,15 @@ public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGrou public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) { searchBinding = FragmentSearchBinding.bind(rootView); super.onViewCreated(rootView, savedInstanceState); + + updateService(); + // Add the service name to search string hint + // to make it more obvious which platform is being searched. + if (service != null) { + searchEditText.setHint( + getString(R.string.search_with_service_name, + service.getServiceInfo().getName())); + } showSearchOnStart(); initSearchListeners(); } @@ -936,6 +945,20 @@ private void changeContentFilter(final MenuItem item, final List theCont filterItemCheckedId = item.getItemId(); item.setChecked(true); + if (service != null) { + final boolean isNotFiltered = theContentFilter.isEmpty() + || "all".equals(theContentFilter.get(0)); + if (isNotFiltered) { + searchEditText.setHint( + getString(R.string.search_with_service_name, + service.getServiceInfo().getName())); + } else { + searchEditText.setHint(getString(R.string.search_with_service_name_and_filter, + service.getServiceInfo().getName(), + item.getTitle())); + } + } + contentFilter = theContentFilter.toArray(new String[0]); if (!TextUtils.isEmpty(searchString)) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2232ddafff0..40a9b78339d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,6 +17,8 @@ Download Download stream file Search + Search %1$s + Search %1$s (%2$s) Settings Did you mean \"%1$s\"? Showing results for: %s