Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge accounts from the same instance in menu

This commit is contained in:
tom79 2017-08-22 09:30:37 +02:00
parent 123f45fca9
commit a12c79755d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -754,12 +754,11 @@ public class Helper {
navigationView.inflateMenu(R.menu.menu_accounts); navigationView.inflateMenu(R.menu.menu_accounts);
Menu mainMenu = navigationView.getMenu(); Menu mainMenu = navigationView.getMenu();
SubMenu currentSubmenu = null; SubMenu currentSubmenu = null;
int i = 0;
for(final Account account: accounts) { for(final Account account: accounts) {
if( !currrentUserId.equals(account.getId()) ) { if( !currrentUserId.equals(account.getId()) ) {
if( !lastInstance.equals(account.getInstance())){ if( !lastInstance.trim().toUpperCase().equals(account.getInstance().trim().toUpperCase())){
currentSubmenu = mainMenu.addSubMenu(0, i, i,account.getInstance().toUpperCase()); lastInstance = account.getInstance().toUpperCase();
i++; currentSubmenu = mainMenu.addSubMenu(account.getInstance().toUpperCase());
} }
if( currentSubmenu == null) if( currentSubmenu == null)
continue; continue;
@ -835,8 +834,7 @@ public class Helper {
} }
} }
i++; currentSubmenu = mainMenu.addSubMenu("");
currentSubmenu = mainMenu.addSubMenu(0, i, i,"");
MenuItem addItem = currentSubmenu.add(R.string.add_account); MenuItem addItem = currentSubmenu.add(R.string.add_account);
addItem.setIcon(R.drawable.ic_person_add); addItem.setIcon(R.drawable.ic_person_add);
addItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { addItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {