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 ca2d4914e..63f13fd45 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 @@ -154,7 +154,7 @@ public class SearchFragment extends BaseListFragment userSelectedSortFilterList = null; public static SearchFragment getInstance(final int serviceId, final String searchString) { - final SearchFragment searchFragment; - final App app = App.getApp(); - - - final String searchUi = PreferenceManager.getDefaultSharedPreferences(app) - .getString(app.getString(R.string.search_filter_ui_key), - app.getString(R.string.search_filter_ui_value)); - if (app.getString(R.string.search_filter_ui_option_menu_legacy_key).equals(searchUi)) { - searchFragment = new SearchFragmentLegacy(); - } else { - searchFragment = new SearchFragment(); - } - + final SearchFragment searchFragment = new SearchFragment(); searchFragment.setQuery(serviceId, searchString, null, null); if (!TextUtils.isEmpty(searchString)) { @@ -679,7 +667,7 @@ public class SearchFragment extends BaseListFragment - * Called ..Legacy because of this was the way NewPipe had implemented the search filter dialog. - * The new UI was implemented using a {@link androidx.fragment.app.DialogFragment} - * {@link SearchFragment} - */ -public class SearchFragmentLegacy extends SearchFragment { - - @State - protected int countOnPrepareOptionsMenuCalls = 0; - private SearchFilterUIOptionMenu searchFilterUi; - - @Override - protected void initializeFilterData() { - try { - final StreamingService service = NewPipe.getService(serviceId); - - searchFilterUi = new SearchFilterUIOptionMenu(service, this, getContext()); - searchFilterUi.restorePreviouslySelectedFilters( - userSelectedContentFilterList, - userSelectedSortFilterList); - - userSelectedContentFilterList = searchFilterUi.getSelectedContentFilters(); - userSelectedSortFilterList = searchFilterUi.getSelectedSortFilters(); - selectedContentFilter = searchFilterUi.getSelectedContentFilterItems(); - selectedSortFilter = searchFilterUi.getSelectedSortFiltersItems(); - } catch (final ExtractionException e) { - throw new RuntimeException(e); - } - } - - @Override - public void onSaveInstanceState(@NonNull final Bundle bundle) { - // get data to save its state via Icepick - userSelectedContentFilterList = searchFilterUi.getSelectedContentFilters(); - userSelectedSortFilterList = searchFilterUi.getSelectedSortFilters(); - - super.onSaveInstanceState(bundle); - } - - @Override - protected void createMenu(@NonNull final Menu menu, - @NonNull final MenuInflater inflater) { - searchFilterUi.createSearchUI(menu); - } - - @Override - public boolean onOptionsItemSelected(@NonNull final MenuItem item) { - return searchFilterUi.onOptionsItemSelected(item); - } - - @Override - protected void initViews(final View rootView, - final Bundle savedInstanceState) { - super.initViews(rootView, savedInstanceState); - final Toolbar toolbar = (Toolbar) searchToolbarContainer.getParent(); - toolbar.setOverflowIcon(ContextCompat.getDrawable(requireContext(), - R.drawable.ic_sort)); - } - - @Override - public void onPrepareOptionsMenu(@NonNull final Menu menu) { - super.onPrepareOptionsMenu(menu); - // workaround: we want to hide the keyboard in case we open the options - // menu. As somehow this method gets triggered twice but only the 2nd - // time is relevant as the options menu is selected by the user. - if (++countOnPrepareOptionsMenuCalls > 1) { - hideKeyboardSearch(); - } - } -} diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index 5cc360db7..b0d4294c1 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -1278,18 +1278,15 @@ dialog style - legacy @string/search_filter_ui_dialog_key @string/search_filter_ui_option_menu_style_key - @string/search_filter_ui_option_menu_legacy_key @string/search_filter_ui_dialog @string/search_filter_ui_style - @string/search_filter_ui_legacy tablet_mode diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5e57bb146..17c5452d1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -552,7 +552,6 @@ Select Search Filter UI Simple Dialog (default) Action Menu styled Dialog - Action Menu (legacy) Seekbar thumbnail preview High quality (larger)