mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring

This commit is contained in:
M66B 2022-11-26 19:44:58 +01:00
parent bc19d5ddea
commit 4cddc76284
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@ -999,17 +999,17 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
});
db.search().liveSearch().observe(owner, new Observer<List<EntitySearch>>() {
db.search().liveSearches().observe(owner, new Observer<List<EntitySearch>>() {
@Override
public void onChanged(List<EntitySearch> search) {
if (search == null)
search = new ArrayList<>();
adapterNavSearch.set(search, nav_expanded);
public void onChanged(List<EntitySearch> searches) {
if (searches == null)
searches = new ArrayList<>();
adapterNavSearch.set(searches, nav_expanded);
boolean nav_search = prefs.getBoolean("nav_search", true);
ibExpanderSearch.setVisibility(search.size() > 0 ? View.VISIBLE : View.GONE);
rvSearch.setVisibility(search.size() > 0 && nav_search ? View.VISIBLE : View.GONE);
vSeparatorSearch.setVisibility(search.size() > 0 ? View.VISIBLE : View.GONE);
ibExpanderSearch.setVisibility(searches.size() > 0 ? View.VISIBLE : View.GONE);
rvSearch.setVisibility(searches.size() > 0 && nav_search ? View.VISIBLE : View.GONE);
vSeparatorSearch.setVisibility(searches.size() > 0 ? View.VISIBLE : View.GONE);
}
});

8
app/src/main/java/eu/faircode/email/AdapterNavSearch.java
View File

@ -142,13 +142,13 @@ public class AdapterNavSearch extends RecyclerView.Adapter<AdapterNavSearch.View
});
}
public void set(@NonNull List<EntitySearch> search, boolean expanded) {
Log.i("Set nav search=" + search.size() + " expanded=" + expanded);
public void set(@NonNull List<EntitySearch> searches, boolean expanded) {
Log.i("Set nav search=" + searches.size() + " expanded=" + expanded);
DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, search), false);
DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, searches), false);
this.expanded = expanded;
this.items = search;
this.items = searches;
diff.dispatchUpdatesTo(new ListUpdateCallback() {
@Override

2
app/src/main/java/eu/faircode/email/DaoSearch.java
View File

@ -31,7 +31,7 @@ import java.util.List;
public interface DaoSearch {
@Query("SELECT * FROM search" +
" ORDER BY `order`, name COLLATE NOCASE")
LiveData<List<EntitySearch>> liveSearch();
LiveData<List<EntitySearch>> liveSearches();
@Query("SELECT * FROM search")
List<EntitySearch> getSearches();