mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Allow multi-select tags

Browse source
This commit is contained in:
Stephen Paul Weber 2024-09-30 17:59:33 +02:00 • committed by Arne
parent 773248134d
commit 54de59a045
1 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -188,7 +188,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
private boolean showLastSeen = false; private boolean showLastSeen = false;
private com.mikepenz.materialdrawer.widget.AccountHeaderView accountHeader; private com.mikepenz.materialdrawer.widget.AccountHeaderView accountHeader;
private Bundle savedState = null; private Bundle savedState = null;
private Tag selectedTag = null; private HashSet<Tag> selectedTag = new HashSet<>();
private long mainFilter = DRAWER_ALL_CHATS; private long mainFilter = DRAWER_ALL_CHATS;
private boolean refreshAccounts = true; private boolean refreshAccounts = true;
@ -465,14 +465,14 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
if (useSavedState != null) { if (useSavedState != null) {
mainFilter = useSavedState.getLong("mainFilter", DRAWER_ALL_CHATS); mainFilter = useSavedState.getLong("mainFilter", DRAWER_ALL_CHATS);
selectedTag = (Tag) useSavedState.getSerializable("selectedTag"); selectedTag = (HashSet<Tag>) useSavedState.getSerializable("selectedTag");
} }
refreshUiReal(); refreshUiReal();
if (useSavedState != null) binding.drawer.setSavedInstance(useSavedState); if (useSavedState != null) binding.drawer.setSavedInstance(useSavedState);
accountHeader.attachToSliderView(binding.drawer); accountHeader.attachToSliderView(binding.drawer);
if (useSavedState != null) accountHeader.withSavedInstance(useSavedState); if (useSavedState != null) accountHeader.withSavedInstance(useSavedState);
if (mainFilter == DRAWER_ALL_CHATS && selectedTag == null) { if (mainFilter == DRAWER_ALL_CHATS && selectedTag.isEmpty()) {
binding.drawer.setSelectedItemIdentifier(DRAWER_ALL_CHATS); binding.drawer.setSelectedItemIdentifier(DRAWER_ALL_CHATS);
} }
@ -493,11 +493,14 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
} else if (id == DRAWER_START_CHAT_DISCOVER) { } else if (id == DRAWER_START_CHAT_DISCOVER) {
launchStartConversation(R.id.discover_public_channels); launchStartConversation(R.id.discover_public_channels);
} else if (id == DRAWER_ALL_CHATS || id == DRAWER_UNREAD_CHATS || id == DRAWER_DIRECT_MESSAGES || id == DRAWER_CHANNELS) { } else if (id == DRAWER_ALL_CHATS || id == DRAWER_UNREAD_CHATS || id == DRAWER_DIRECT_MESSAGES || id == DRAWER_CHANNELS) {
selectedTag = null; selectedTag.clear();
mainFilter = id; mainFilter = id;
binding.drawer.getSelectExtension().deselect(); binding.drawer.getSelectExtension().deselect();
} else if (id >= 1000) { } else if (id >= 1000) {
selectedTag = (Tag) drawerItem.getTag(); selectedTag.clear();
selectedTag.add((Tag) drawerItem.getTag());
binding.drawer.getSelectExtension().deselect();
binding.drawer.getSelectExtension().select(pos, false, true);
} }
binding.drawer.getSelectExtension().selectByIdentifier(mainFilter, false, true); binding.drawer.getSelectExtension().selectByIdentifier(mainFilter, false, true);
@ -514,7 +517,29 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
return false; return false;
}); });
accountHeader.setOnAccountHeaderListener((v, profile, isCurrent) -> { binding.drawer.setOnDrawerItemLongClickListener((v, drawerItem, pos) -> {
final var id = drawerItem.getIdentifier();
if (id == DRAWER_ALL_CHATS || id == DRAWER_UNREAD_CHATS || id == DRAWER_DIRECT_MESSAGES || id == DRAWER_CHANNELS) {
selectedTag.clear();
mainFilter = id;
binding.drawer.getSelectExtension().deselect();
} else if (id >= 1000) {
final var tag = (Tag) drawerItem.getTag();
if (selectedTag.contains(tag)) {
selectedTag.remove(tag);
binding.drawer.getSelectExtension().deselect(pos);
} else {
selectedTag.add(tag);
binding.drawer.getSelectExtension().select(pos, false, true);
}
}
binding.drawer.getSelectExtension().selectByIdentifier(mainFilter, false, true);
refreshUi();
return true;
});
accountHeader.setOnAccountHeaderListener((v, profile, isCurrent) -> {
final var id = profile.getIdentifier(); final var id = profile.getIdentifier();
if (isCurrent) return false; // Ignore switching to already selected profile if (isCurrent) return false; // Ignore switching to already selected profile
@ -610,8 +635,10 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
list.remove(c); list.remove(c);
} else if (selectedAccount != null && !selectedAccount.equals(c.getAccount().getUuid())) { } else if (selectedAccount != null && !selectedAccount.equals(c.getAccount().getUuid())) {
list.remove(c); list.remove(c);
} else if (selectedTag != null && tagFilter && !c.getTags(this).contains(selectedTag)) { } else if (!selectedTag.isEmpty() && tagFilter) {
list.remove(c); final var tags = new HashSet<>(c.getTags(this));
tags.retainAll(selectedTag);
if (tags.isEmpty()) list.remove(c);
} }
} }
} }
@ -623,7 +650,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
public void launchStartConversation(int goTo) { public void launchStartConversation(int goTo) {
if (accountHeader.getActiveProfile() != null) { if (accountHeader.getActiveProfile() != null) {
StartConversationActivity.launch(this, (Account) accountHeader.getActiveProfile().getTag(), selectedTag == null ? null : selectedTag.getName(), goTo); StartConversationActivity.launch(this, (Account) accountHeader.getActiveProfile().getTag(), selectedTag.stream().map(tag -> tag.getName()).collect(Collectors.joining(", ")), goTo);
} }
} }