Skip to content

Add state to filter categories, if present #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dektar merged 1 commit into from
Feb 19, 2026
Merged

Add state to filter categories, if present #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions 5calls/app/src/main/java/org/a5calls/android/a5calls/adapter/IssuesAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.a5calls.android.a5calls.model.Contact;
import org.a5calls.android.a5calls.model.DatabaseHelper;
import org.a5calls.android.a5calls.model.Issue;
import org.a5calls.android.a5calls.util.StateMapping;

import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -131,7 +130,7 @@ public void setFilterAndSearch(String filterText, String searchText) {
mIssues = sortIssuesWithMetaPriority(filterActiveIssues());
} else {
// Filter by the category string.
mIssues = sortIssuesWithMetaPriority(filterIssuesByCategory(filterText));
mIssues = sortIssuesWithMetaPriority(filterIssuesByCategory(mAllIssues, filterText));
}
}
notifyDataSetChanged();
Expand Down Expand Up @@ -213,9 +212,15 @@ private ArrayList<Issue> filterActiveIssues() {
return tempIssues;
}

private ArrayList<Issue> filterIssuesByCategory(String activeCategory) {
@VisibleForTesting
public static ArrayList<Issue> filterIssuesByCategory(List<Issue> issues, String activeCategory) {
ArrayList<Issue> tempIssues = new ArrayList<>();
for (Issue issue : mAllIssues) {
for (Issue issue : issues) {
// Categories include state.
if (TextUtils.equals(issue.getStateName(), activeCategory)) {
tempIssues.add(issue);
continue;
}
for (Category category : issue.categories) {
if (TextUtils.equals(activeCategory, category.name)) {
tempIssues.add(issue);
Expand Down Expand Up @@ -314,16 +319,11 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
final Issue issue = mIssues.get(position);
vh.name.setText(issue.name);

// Show state indicator if issue has meta (state abbreviation) and we can map it to a state name
if (!TextUtils.isEmpty(issue.meta)) {
String stateName = StateMapping.getStateName(issue.meta);
if (!TextUtils.isEmpty(stateName)) {
vh.stateIndicator.setText(stateName);
vh.stateIndicator.setVisibility(View.VISIBLE);

} else {
vh.stateIndicator.setVisibility(View.GONE);
}
// Show state indicator if issue has a state set.
String stateName = issue.getStateName();
if (!TextUtils.isEmpty(stateName)) {
vh.stateIndicator.setText(stateName);
vh.stateIndicator.setVisibility(View.VISIBLE);
} else {
vh.stateIndicator.setVisibility(View.GONE);
}
Expand Down
5 changes: 5 additions & 0 deletions 5calls/app/src/main/java/org/a5calls/android/a5calls/controller/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,11 @@ private void populateFilterAdapterIfNeeded(List<Issue> issues) {
if (issue.categories == null) {
continue;
}
// Add state items filter.
String state = issue.getStateName();
if (!TextUtils.isEmpty(state) && !topics.contains(state)) {
topics.add(state);
Comment thread
dektar marked this conversation as resolved.
}
for (Category category : issue.categories) {
if (!topics.contains(category.name)) {
topics.add(category.name);
Expand Down
11 changes: 11 additions & 0 deletions 5calls/app/src/main/java/org/a5calls/android/a5calls/model/Issue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
import android.os.Parcelable;
import android.text.TextUtils;

import org.a5calls.android.a5calls.util.StateMapping;

import java.util.List;

import androidx.annotation.Nullable;

/**
* Represents an issue.
*/
Expand Down Expand Up @@ -104,4 +108,11 @@ public String getScriptForContact(String contactId) {
}
return script;
}

public @Nullable String getStateName() {
if (TextUtils.isEmpty(meta)) {
return null;
}
return StateMapping.getStateName(meta);
}
}
Loading