|
|
@ -2569,17 +2569,27 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
|
|
|
|
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), fabReply);
|
|
|
|
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(getContext(), getViewLifecycleOwner(), fabReply);
|
|
|
|
Menu main = popupMenu.getMenu();
|
|
|
|
Menu main = popupMenu.getMenu();
|
|
|
|
|
|
|
|
|
|
|
|
Map<String, SubMenu> map = new HashMap<>();
|
|
|
|
List<String> groups = new ArrayList<>();
|
|
|
|
|
|
|
|
for (EntityAnswer answer : answers)
|
|
|
|
|
|
|
|
if (answer.group != null && !groups.contains(answer.group))
|
|
|
|
|
|
|
|
groups.add(answer.group);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Collator collator = Collator.getInstance(Locale.getDefault());
|
|
|
|
|
|
|
|
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
|
|
|
|
|
|
|
|
Collections.sort(groups, collator);
|
|
|
|
|
|
|
|
|
|
|
|
int order = 0;
|
|
|
|
int order = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Map<String, SubMenu> map = new HashMap<>();
|
|
|
|
|
|
|
|
for (String group : groups)
|
|
|
|
|
|
|
|
map.put(group, main.addSubMenu(Menu.NONE, order, order++, group));
|
|
|
|
|
|
|
|
|
|
|
|
for (EntityAnswer answer : answers) {
|
|
|
|
for (EntityAnswer answer : answers) {
|
|
|
|
order++;
|
|
|
|
order++;
|
|
|
|
if (answer.group == null)
|
|
|
|
if (answer.group == null)
|
|
|
|
main.add(Menu.NONE, order, order++, answer.toString())
|
|
|
|
main.add(Menu.NONE, order, order++, answer.toString())
|
|
|
|
.setIntent(new Intent().putExtra("id", answer.id));
|
|
|
|
.setIntent(new Intent().putExtra("id", answer.id));
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
if (!map.containsKey(answer.group))
|
|
|
|
|
|
|
|
map.put(answer.group, main.addSubMenu(Menu.NONE, order, order++, answer.group));
|
|
|
|
|
|
|
|
SubMenu smenu = map.get(answer.group);
|
|
|
|
SubMenu smenu = map.get(answer.group);
|
|
|
|
smenu.add(Menu.NONE, smenu.size(), smenu.size() + 1, answer.toString())
|
|
|
|
smenu.add(Menu.NONE, smenu.size(), smenu.size() + 1, answer.toString())
|
|
|
|
.setIntent(new Intent().putExtra("id", answer.id));
|
|
|
|
.setIntent(new Intent().putExtra("id", answer.id));
|
|
|
|