MaintainTeam/LastPipeBender
1
0
Fork 0
mirror of https://github.com/MaintainTeam/LastPipeBender.git synced 2025-03-01 13:58:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

searchfilters: replace Map<Integer, Integer> with SparseIntArray

Browse source
This commit is contained in:
evermind 2022-11-11 21:57:04 +01:00
parent 0dc3f105ad
commit 868be7a905
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/schabi/newpipe/fragments/list/search/filter/SearchFilterDialogSpinnerAdapter.java
View file

@ -4,6 +4,7 @@ package org.schabi.newpipe.fragments.list.search.filter;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.util.SparseIntArray;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -28,7 +29,7 @@ public class SearchFilterDialogSpinnerAdapter extends BaseAdapter {
private final FilterGroup group; private final FilterGroup group;
private final BaseSearchFilterUiGenerator.UiWrapperMapDelegate wrapperDelegate; private final BaseSearchFilterUiGenerator.UiWrapperMapDelegate wrapperDelegate;
private final Spinner spinner; private final Spinner spinner;
private final Map<Integer, Integer> id2PosMap = new HashMap<>(); private final SparseIntArray id2PosMap = new SparseIntArray();
private final Map<Integer, UiItemWrapperSpinner> private final Map<Integer, UiItemWrapperSpinner>
viewWrapperMap = new HashMap<>(); viewWrapperMap = new HashMap<>();

16
app/src/main/java/org/schabi/newpipe/fragments/list/search/filter/SearchFilterLogic.java
View file

@ -2,6 +2,8 @@
package org.schabi.newpipe.fragments.list.search.filter; package org.schabi.newpipe.fragments.list.search.filter;
import android.util.SparseIntArray;
import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory; import org.schabi.newpipe.extractor.linkhandler.SearchQueryHandlerFactory;
import org.schabi.newpipe.extractor.search.filter.FilterContainer; import org.schabi.newpipe.extractor.search.filter.FilterContainer;
import org.schabi.newpipe.extractor.search.filter.FilterGroup; import org.schabi.newpipe.extractor.search.filter.FilterGroup;
@ -638,7 +640,7 @@ public class SearchFilterLogic {
*/ */
private static class ExclusiveGroups { private static class ExclusiveGroups {
final Map<Integer, Integer> actualSelectedFilterIdInExclusiveGroupMap = new HashMap<>(); final SparseIntArray actualSelectedFilterIdInExclusiveGroupMap = new SparseIntArray();
/** /**
* To quickly determine if a content filter group supports * To quickly determine if a content filter group supports
* only one item selected (exclusiveness), we need a set that resembles that. * only one item selected (exclusiveness), we need a set that resembles that.
@ -648,7 +650,7 @@ public class SearchFilterLogic {
* To quickly determine if a content filter id belongs to an exclusive group. * To quickly determine if a content filter id belongs to an exclusive group.
* This maps works in conjunction with {@link #exclusiveGroupsIdSet} * This maps works in conjunction with {@link #exclusiveGroupsIdSet}
*/ */
private final Map<Integer, Integer> filterIdToGroupIdMap = new HashMap<>(); private final SparseIntArray filterIdToGroupIdMap = new SparseIntArray();
/** /**
* Clear {@link #exclusiveGroupsIdSet} and {@link #filterIdToGroupIdMap}. * Clear {@link #exclusiveGroupsIdSet} and {@link #filterIdToGroupIdMap}.
@ -666,7 +668,7 @@ public class SearchFilterLogic {
* @return true if valid * @return true if valid
*/ */
public boolean filterIdToGroupIdMapContainsId(final int filterId) { public boolean filterIdToGroupIdMapContainsId(final int filterId) {
return filterIdToGroupIdMap.containsKey(filterId); return filterIdToGroupIdMap.indexOfKey(filterId) >= 0;
} }
public boolean isFilterIdPartOfAnExclusiveGroup(final int filterId) { public boolean isFilterIdPartOfAnExclusiveGroup(final int filterId) {
@ -744,10 +746,10 @@ public class SearchFilterLogic {
int previousFilterId = ITEM_IDENTIFIER_UNKNOWN; int previousFilterId = ITEM_IDENTIFIER_UNKNOWN;
final int filterGroupId = filterIdToGroupIdMap.get(filterId); final int filterGroupId = filterIdToGroupIdMap.get(filterId);
if (exclusiveGroupsIdSet.contains(filterGroupId) final int index = actualSelectedFilterIdInExclusiveGroupMap.indexOfKey(filterGroupId);
&& actualSelectedFilterIdInExclusiveGroupMap.containsKey(filterGroupId)) { if (exclusiveGroupsIdSet.contains(filterGroupId) && index >= 0) {
previousFilterId = actualSelectedFilterIdInExclusiveGroupMap.get(filterGroupId); previousFilterId = actualSelectedFilterIdInExclusiveGroupMap.valueAt(index);
actualSelectedFilterIdInExclusiveGroupMap.remove(filterGroupId); actualSelectedFilterIdInExclusiveGroupMap.removeAt(index);
} }
return previousFilterId; return previousFilterId;
} }