Skip to content

Commit d02c322

Browse files
committed
searchfilters: integrate 2nd Ui into SearchFragment
1 parent c8320ab commit d02c322

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
@@ -61,6 +61,7 @@
6161
import org.schabi.newpipe.fragments.list.search.filter.BaseSearchFilterDialogFragment;
6262
import org.schabi.newpipe.fragments.list.search.filter.SearchFilterDialogFragment;
6363
import org.schabi.newpipe.fragments.list.search.filter.SearchFilterLogic;
64+
import org.schabi.newpipe.fragments.list.search.filter.SearchFilterOptionMenuAlikeDialogFragment;
6465
import org.schabi.newpipe.ktx.AnimationType;
6566
import org.schabi.newpipe.ktx.ExceptionUtils;
6667
import org.schabi.newpipe.local.history.HistoryRecordManager;
@@ -1081,9 +1082,20 @@ public void onSuggestionItemSwiped(@NonNull final RecyclerView.ViewHolder viewHo
10811082

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

10881100
searchFilterUiDialog.setTargetFragment(SearchFragment.this, 300);
10891101
searchFilterUiDialog.show(fragmentManager, "fragment_search");

0 commit comments

Comments
 (0)