Skip to content

Commit 03bb212

Browse files
committed
Removed breadcrumbs customization
1 parent e2f449f commit 03bb212

3 files changed

Lines changed: 2 additions & 13 deletions

File tree

app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ public boolean onOptionsItemSelected(final MenuItem item) {
171171
@Override
172172
public boolean onPreferenceStartFragment(final PreferenceFragmentCompat caller,
173173
final Preference preference) {
174-
preference.getExtras()
175174
showSettingsFragment(instantiateFragment(preference.getFragment()));
176175
return true;
177176
}

app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceParser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.util.List;
1616
import java.util.Map;
1717
import java.util.Objects;
18+
import java.util.stream.Collectors;
1819

1920
/**
2021
* Parses the corresponding preference-file(s).
@@ -82,7 +83,7 @@ public List<PreferenceSearchItem> parse(
8283
private String joinBreadcrumbs(final List<String> breadcrumbs) {
8384
return breadcrumbs.stream()
8485
.filter(crumb -> !TextUtils.isEmpty(crumb))
85-
.reduce("", searchConfiguration.getBreadcrumbConcat());
86+
.collect(Collectors.joining(" > "));
8687
}
8788

8889
private String getAttribute(

app/src/main/java/org/schabi/newpipe/settings/preferencesearch/PreferenceSearchConfiguration.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
import java.util.stream.Stream;
1313

1414
public class PreferenceSearchConfiguration {
15-
private BinaryOperator<String> breadcrumbConcat =
16-
(s1, s2) -> TextUtils.isEmpty(s1) ? s2 : (s1 + " > " + s2);
17-
1815
private PreferenceSearchFunction searcher = new PreferenceFuzzySearchFunction();
1916

2017
private final List<String> parserIgnoreElements = Arrays.asList(
@@ -24,18 +21,10 @@ public class PreferenceSearchConfiguration {
2421
PreferenceScreen.class.getSimpleName());
2522

2623

27-
public void setBreadcrumbConcat(final BinaryOperator<String> breadcrumbConcat) {
28-
this.breadcrumbConcat = Objects.requireNonNull(breadcrumbConcat);
29-
}
30-
3124
public void setSearcher(final PreferenceSearchFunction searcher) {
3225
this.searcher = Objects.requireNonNull(searcher);
3326
}
3427

35-
public BinaryOperator<String> getBreadcrumbConcat() {
36-
return breadcrumbConcat;
37-
}
38-
3928
public PreferenceSearchFunction getSearcher() {
4029
return searcher;
4130
}

0 commit comments

Comments
 (0)