Merge pull request #1100 from beemdevelopment/bugfix/empty-state

Fix empty state while using search filter
This commit is contained in:
Alexander Bakker 2023-03-01 12:11:23 +01:00 committed by GitHub
commit 90f2ea79d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions

View File

@ -286,6 +286,10 @@ public class EntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
}
}
public String getSearchFilter() {
return _searchFilter;
}
public void setSearchFilter(String search) {
_searchFilter = (search != null && !search.isEmpty()) ? search.toLowerCase() : null;
updateShownEntries();

View File

@ -45,6 +45,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.android.material.chip.Chip;
import com.google.android.material.chip.ChipGroup;
import com.google.android.material.divider.MaterialDividerItemDecoration;
import com.google.common.base.Strings;
import java.util.Collection;
import java.util.Collections;
@ -207,6 +208,8 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
public void setSearchFilter(String search) {
_adapter.setSearchFilter(search);
_touchCallback.setIsLongPressDragEnabled(_adapter.isDragAndDropAllowed());
updateEmptyState();
}
public void setSelectedEntry(VaultEntry entry) {
@ -546,8 +549,10 @@ public class EntryListView extends Fragment implements EntryAdapter.Listener {
_recyclerView.setVisibility(View.VISIBLE);
_emptyStateView.setVisibility(View.GONE);
} else {
_recyclerView.setVisibility(View.GONE);
_emptyStateView.setVisibility(View.VISIBLE);
if (Strings.isNullOrEmpty(_adapter.getSearchFilter())) {
_recyclerView.setVisibility(View.GONE);
_emptyStateView.setVisibility(View.VISIBLE);
}
}
}