Skip to content

Commit dd13ec4

Browse files
evermind-zzevermind-zz
committed
searchfilters: use reworked getTranslatedFilterString() method
Adjust to changes in NewPipeExtractor's FilterGroup and FilterItem class.
1 parent 9ca7c1f commit dd13ec4

4 files changed

Lines changed: 21 additions & 19 deletions

File tree

‎app/src/main/java/org/schabi/newpipe/fragments/list/search/filter/SearchFilterDialogGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ protected void createFilterGroup(final FilterGroup filterGroup,
8383
final UiItemWrapperViews viewsWrapper = new UiItemWrapperViews(
8484
filterGroup.getIdentifier());
8585

86-
if (filterGroup.getName() != null) {
86+
if (filterGroup.getNameId() != null) {
8787
final TextView filterLabel = new TextView(context);
8888

8989
filterLabel.setId(filterGroup.getIdentifier());
9090
filterLabel.setText(
91-
ServiceHelper.getTranslatedFilterString(filterGroup.getName(), context));
91+
ServiceHelper.getTranslatedFilterString(filterGroup.getNameId(), context));
9292
filterLabel.setGravity(Gravity.CENTER_VERTICAL);
9393
setDefaultMargin(layoutParams);
9494
setZeroPadding(filterLabel);
@@ -167,7 +167,7 @@ private void createUiElementsForMultipleSelectableItemsFilterGroup(
167167
for (final FilterItem item : filterGroup.getFilterItems()) {
168168
final Chip chip = new Chip(new ContextThemeWrapper(
169169
context, R.style.Theme_MaterialComponents_Light));
170-
chip.setText(ServiceHelper.getTranslatedFilterString(item.getName(), context));
170+
chip.setText(ServiceHelper.getTranslatedFilterString(item.getNameId(), context));
171171
chip.setId(item.getIdentifier());
172172
chip.setCheckable(true);
173173
final View.OnClickListener listener;

‎app/src/main/java/org/schabi/newpipe/fragments/list/search/filter/SearchFilterDialogSpinnerAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ private void initViewWithData(final int position,
8484
Objects.requireNonNull(wrappedView);
8585

8686
view.setId(item.getIdentifier());
87-
view.setText(ServiceHelper.getTranslatedFilterString(item.getName(), context));
87+
view.setText(ServiceHelper.getTranslatedFilterString(item.getNameId(), context));
8888
view.setVisibility(wrappedView.getVisibility());
8989
view.setEnabled(wrappedView.isEnabled());
9090

9191
if (item instanceof FilterItem.DividerItem) {
9292
wrappedView.setEnabled(false);
9393
view.setEnabled(wrappedView.isEnabled());
9494
final String menuDividerTitle = ">>>"
95-
+ ServiceHelper.getTranslatedFilterString(item.getName(), context) + "<<<";
95+
+ ServiceHelper.getTranslatedFilterString(item.getNameId(), context) + "<<<";
9696
view.setText(menuDividerTitle);
9797
}
9898
}

‎app/src/main/java/org/schabi/newpipe/fragments/list/search/filter/SearchFilterOptionMenuAlikeDialogGenerator.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ protected void createFilterGroup(final FilterGroup filterGroup,
115115
globalLayout.addView(separatorLine);
116116
viewsWrapper.add(separatorLine);
117117

118-
if (filterGroup.getName() != null) {
118+
if (filterGroup.getNameId() != null) {
119119
final TextView filterLabel =
120120
createFilterGroupLabel(filterGroup, getLayoutParamsLabelLeft());
121121
globalLayout.addView(filterLabel);
@@ -251,7 +251,7 @@ private TextView createFilterGroupLabel(final FilterGroup filterGroup,
251251
final TextView filterLabel = new TextView(context);
252252
filterLabel.setId(filterGroup.getIdentifier());
253253
filterLabel.setText(ServiceHelper
254-
.getTranslatedFilterString(filterGroup.getName(), context));
254+
.getTranslatedFilterString(filterGroup.getNameId(), context));
255255
filterLabel.setGravity(Gravity.TOP);
256256
// resizing not needed as view is not selectable
257257
filterLabel.setTag(NO_RESIZE_VIEW_TAG);
@@ -264,7 +264,7 @@ private CheckBox createCheckBox(final FilterItem item,
264264
final CheckBox checkBox = new CheckBox(context);
265265
checkBox.setLayoutParams(layoutParams);
266266
checkBox.setText(ServiceHelper.getTranslatedFilterString(
267-
item.getName(), context));
267+
item.getNameId(), context));
268268
checkBox.setId(item.getIdentifier());
269269
checkBox.setTextSize(COMPLEX_UNIT_DIP, FONT_SIZE_SELECTABLE_VIEW_ITEMS_IN_DIP);
270270
return checkBox;
@@ -275,7 +275,7 @@ private TextView createDividerTextView(final FilterItem item,
275275
final TextView view = new TextView(context);
276276
view.setEnabled(true);
277277
final String menuDividerTitle =
278-
ServiceHelper.getTranslatedFilterString(item.getName(), context);
278+
ServiceHelper.getTranslatedFilterString(item.getNameId(), context);
279279
view.setText(menuDividerTitle);
280280
view.setGravity(Gravity.TOP);
281281
view.setLayoutParams(layoutParams);
@@ -286,7 +286,7 @@ private RadioButton createViewItemRadio(final FilterItem item,
286286
final ViewGroup.LayoutParams layoutParams) {
287287
final RadioButton view = new RadioButton(context);
288288
view.setId(item.getIdentifier());
289-
view.setText(ServiceHelper.getTranslatedFilterString(item.getName(), context));
289+
view.setText(ServiceHelper.getTranslatedFilterString(item.getNameId(), context));
290290
view.setLayoutParams(layoutParams);
291291
view.setTextSize(COMPLEX_UNIT_DIP, FONT_SIZE_SELECTABLE_VIEW_ITEMS_IN_DIP);
292292
return view;

‎app/src/main/java/org/schabi/newpipe/fragments/list/search/filter/SearchFilterUIOptionMenu.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.schabi.newpipe.extractor.search.filter.FilterContainer;
1515
import org.schabi.newpipe.extractor.search.filter.FilterGroup;
1616
import org.schabi.newpipe.extractor.search.filter.FilterItem;
17+
import org.schabi.newpipe.extractor.search.filter.LibraryStringIds;
1718
import org.schabi.newpipe.util.ServiceHelper;
1819

1920
import java.util.ArrayList;
@@ -216,19 +217,20 @@ public void prepare() {
216217
@Override
217218
public void createFilterGroupBeforeItems(
218219
final FilterGroup filterGroup) {
219-
if (filterGroup.getName() != null) {
220+
if (filterGroup.getNameId() != null) {
220221
createNotEnabledAndUncheckableGroupTitleMenuItem(
221-
FilterContainer.ITEM_IDENTIFIER_UNKNOWN, filterGroup.getName());
222+
FilterContainer.ITEM_IDENTIFIER_UNKNOWN, filterGroup.getNameId());
222223
}
223224
}
224225

225-
protected MenuItem createNotEnabledAndUncheckableGroupTitleMenuItem(final int identifier,
226-
final String name) {
226+
protected MenuItem createNotEnabledAndUncheckableGroupTitleMenuItem(
227+
final int identifier,
228+
final LibraryStringIds nameId) {
227229
final MenuItem item = menu.add(
228230
newLastUsedGroupId,
229231
identifier,
230232
0,
231-
ServiceHelper.getTranslatedFilterString(name, context));
233+
ServiceHelper.getTranslatedFilterString(nameId, context));
232234
item.setEnabled(false);
233235

234236
nonCheckableMenuItems.add(item);
@@ -244,7 +246,7 @@ public void createFilterItem(final FilterItem filterItem,
244246

245247
if (filterItem instanceof FilterItem.DividerItem) {
246248
final String menuDividerTitle = ">>>"
247-
+ ServiceHelper.getTranslatedFilterString(filterItem.getName(), context)
249+
+ ServiceHelper.getTranslatedFilterString(filterItem.getNameId(), context)
248250
+ "<<<";
249251
item.setTitle(menuDividerTitle);
250252
item.setEnabled(false);
@@ -259,7 +261,7 @@ protected MenuItem createMenuItem(final FilterItem filterItem) {
259261
return menu.add(newLastUsedGroupId,
260262
filterItem.getIdentifier(),
261263
0,
262-
ServiceHelper.getTranslatedFilterString(filterItem.getName(), context));
264+
ServiceHelper.getTranslatedFilterString(filterItem.getNameId(), context));
263265
}
264266

265267
@Override
@@ -294,9 +296,9 @@ public void prepare() {
294296
@Override
295297
public void createFilterGroupBeforeItems(
296298
final FilterGroup filterGroup) {
297-
if (filterGroup.getName() != null) {
299+
if (filterGroup.getNameId() != null) {
298300
final MenuItem item = createNotEnabledAndUncheckableGroupTitleMenuItem(
299-
filterGroup.getIdentifier(), filterGroup.getName());
301+
filterGroup.getIdentifier(), filterGroup.getNameId());
300302
addSortFilterUiToItemMap(filterGroup.getIdentifier(), item);
301303
}
302304
}

0 commit comments

Comments
 (0)