Skip to content

Commit e453d13

Browse files
committed
searchfilters: integrate 2nd Ui into SearchFragment
1 parent 9f706d1 commit e453d13

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import org.schabi.newpipe.fragments.list.BaseListFragment;
6161
import org.schabi.newpipe.fragments.list.search.filter.SearchFilterDialogFragment;
6262
import org.schabi.newpipe.fragments.list.search.filter.SearchFilterLogic;
63+
import org.schabi.newpipe.fragments.list.search.filter.SearchFilterOptionMenuAlikeDialogFragment;
6364
import org.schabi.newpipe.ktx.AnimationType;
6465
import org.schabi.newpipe.ktx.ExceptionUtils;
6566
import org.schabi.newpipe.local.history.HistoryRecordManager;
@@ -1079,9 +1080,20 @@ public void onSuggestionItemSwiped(@NonNull final RecyclerView.ViewHolder viewHo
10791080

10801081
private void showSelectFiltersDialog() {
10811082
final FragmentManager fragmentManager = getParentFragmentManager();
1082-
final DialogFragment searchFilterUiDialog =
1083-
SearchFilterDialogFragment.newInstance(
1084-
serviceId, userSelectedContentFilterList, userSelectedSortFilterList);
1083+
final DialogFragment searchFilterUiDialog;
1084+
1085+
final String searchUi = PreferenceManager.getDefaultSharedPreferences(App.getApp())
1086+
.getString(getString(R.string.search_filter_ui_key),
1087+
getString(R.string.search_filter_ui_value));
1088+
if (getString(R.string.search_filter_ui_dialog_key).equals(searchUi)) {
1089+
searchFilterUiDialog =
1090+
SearchFilterDialogFragment.newInstance(
1091+
serviceId, userSelectedContentFilterList, userSelectedSortFilterList);
1092+
} else {
1093+
searchFilterUiDialog =
1094+
SearchFilterOptionMenuAlikeDialogFragment.newInstance(
1095+
serviceId, userSelectedContentFilterList, userSelectedSortFilterList);
1096+
}
10851097

10861098
searchFilterUiDialog.setTargetFragment(SearchFragment.this, 300);
10871099
searchFilterUiDialog.show(fragmentManager, "fragment_search");

0 commit comments

Comments
 (0)