Skip to content

X
xabber-android
Commit 4a374d5f authored by Alexander Ivanov's avatar Alexander Ivanov
Browse files
Options

Set offline mode menu actions while ContextMenu creation.

parent 362aa208
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 58 deletions
src/com/xabber/android/ui/ContactList.java
View file @ 4a374d5f
...@@ -142,9 +142,6 @@ public class ContactList extends ManagedListActivity implements ...@@ -142,9 +142,6 @@ public class ContactList extends ManagedListActivity implements
private static final int CONTEXT_MENU_GROUP_DELETE_ID = 0x32; private static final int CONTEXT_MENU_GROUP_DELETE_ID = 0x32;
private static final int CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID = 0x40; private static final int CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID = 0x40;
private static final int CONTEXT_MENU_SHOW_OFFLINE_ALWAYS_ID = 0x41;
private static final int CONTEXT_MENU_SHOW_OFFLINE_NORMAL_ID = 0x42;
private static final int CONTEXT_MENU_SHOW_OFFLINE_NEVER_ID = 0x43;
private static final int DIALOG_CLOSE_APPLICATION_ID = 0x57; private static final int DIALOG_CLOSE_APPLICATION_ID = 0x57;
...@@ -559,7 +556,7 @@ public class ContactList extends ManagedListActivity implements ...@@ -559,7 +556,7 @@ public class ContactList extends ManagedListActivity implements
menu.add(0, CONTEXT_MENU_GROUP_DELETE_ID, 0, menu.add(0, CONTEXT_MENU_GROUP_DELETE_ID, 0,
getText(R.string.group_remove)); getText(R.string.group_remove));
} }
createOfflineModeContextMenu(menu); createOfflineModeContextMenu(account, group, menu);
} }
private void createAccountContextMenu(final String account, ContextMenu menu) { private void createAccountContextMenu(final String account, ContextMenu menu) {
...@@ -611,39 +608,43 @@ public class ContactList extends ManagedListActivity implements ...@@ -611,39 +608,43 @@ public class ContactList extends ManagedListActivity implements
menu.add(R.string.contact_add).setIntent( menu.add(R.string.contact_add).setIntent(
ContactAdd.createIntent(this, account)); ContactAdd.createIntent(this, account));
} }
createOfflineModeContextMenu(menu); if (SettingsManager.contactsShowAccounts())
createOfflineModeContextMenu(account, null, menu);
} }
private void createOfflineModeContextMenu(ContextMenu menu) { private void createOfflineModeContextMenu(String account, String group,
if (actionWithGroup != null || SettingsManager.contactsShowAccounts()) { ContextMenu menu) {
SubMenu mapMode = menu.addSubMenu(getResources().getText( SubMenu mapMode = menu.addSubMenu(getResources().getText(
R.string.show_offline_settings)); R.string.show_offline_settings));
mapMode.setHeaderTitle(R.string.show_offline_settings); mapMode.setHeaderTitle(R.string.show_offline_settings);
MenuItem always = mapMode.add(CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID, MenuItem always = mapMode.add(CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID, 0, 0,
CONTEXT_MENU_SHOW_OFFLINE_ALWAYS_ID, 0, getResources() getText(R.string.show_offline_always))
.getText(R.string.show_offline_always)); .setOnMenuItemClickListener(
MenuItem normal = mapMode.add(CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID, new OfflineModeClickListener(account, group,
CONTEXT_MENU_SHOW_OFFLINE_NORMAL_ID, 0, getResources() ShowOfflineMode.always));
.getText(R.string.show_offline_normal)); MenuItem normal = mapMode.add(CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID, 0, 0,
MenuItem never = mapMode.add(CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID, getText(R.string.show_offline_normal))
CONTEXT_MENU_SHOW_OFFLINE_NEVER_ID, 0, getResources() .setOnMenuItemClickListener(
.getText(R.string.show_offline_never)); new OfflineModeClickListener(account, group,
mapMode.setGroupCheckable(CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID, true, ShowOfflineMode.normal));
true); MenuItem never = mapMode.add(CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID, 0, 0,
ShowOfflineMode showOfflineMode = GroupManager.getInstance() getText(R.string.show_offline_never))
.getShowOfflineMode( .setOnMenuItemClickListener(
actionWithAccount, new OfflineModeClickListener(account, group,
actionWithGroup == null ? GroupManager.IS_ACCOUNT ShowOfflineMode.never));
: actionWithGroup); mapMode.setGroupCheckable(CONTEXT_MENU_SHOW_OFFLINE_GROUP_ID, true,
if (showOfflineMode == ShowOfflineMode.always) true);
always.setChecked(true); ShowOfflineMode showOfflineMode = GroupManager.getInstance()
else if (showOfflineMode == ShowOfflineMode.normal) .getShowOfflineMode(account,
normal.setChecked(true); group == null ? GroupManager.IS_ACCOUNT : group);
else if (showOfflineMode == ShowOfflineMode.never) if (showOfflineMode == ShowOfflineMode.always)
never.setChecked(true); always.setChecked(true);
else else if (showOfflineMode == ShowOfflineMode.normal)
throw new IllegalStateException(); normal.setChecked(true);
} else if (showOfflineMode == ShowOfflineMode.never)
never.setChecked(true);
else
throw new IllegalStateException();
} }
@Override @Override
...@@ -737,29 +738,6 @@ public class ContactList extends ManagedListActivity implements ...@@ -737,29 +738,6 @@ public class ContactList extends ManagedListActivity implements
: actionWithAccount, actionWithGroup).show( : actionWithAccount, actionWithGroup).show(
getSupportFragmentManager(), "GROUP_DELETE"); getSupportFragmentManager(), "GROUP_DELETE");
return true; return true;
// Groups or account
case CONTEXT_MENU_SHOW_OFFLINE_ALWAYS_ID:
GroupManager.getInstance().setShowOfflineMode(
actionWithAccount,
actionWithGroup == null ? GroupManager.IS_ACCOUNT
: actionWithGroup, ShowOfflineMode.always);
contactListAdapter.onChange();
return true;
case CONTEXT_MENU_SHOW_OFFLINE_NORMAL_ID:
GroupManager.getInstance().setShowOfflineMode(
actionWithAccount,
actionWithGroup == null ? GroupManager.IS_ACCOUNT
: actionWithGroup, ShowOfflineMode.normal);
contactListAdapter.onChange();
return true;
case CONTEXT_MENU_SHOW_OFFLINE_NEVER_ID:
GroupManager.getInstance().setShowOfflineMode(
actionWithAccount,
actionWithGroup == null ? GroupManager.IS_ACCOUNT
: actionWithGroup, ShowOfflineMode.never);
contactListAdapter.onChange();
return true;
} }
return false; return false;
} }
...@@ -1025,6 +1003,31 @@ public class ContactList extends ManagedListActivity implements ...@@ -1025,6 +1003,31 @@ public class ContactList extends ManagedListActivity implements
0); 0);
} }
private class OfflineModeClickListener implements
MenuItem.OnMenuItemClickListener {
private final String account;
private final String group;
private final ShowOfflineMode mode;
public OfflineModeClickListener(String account, String group,
ShowOfflineMode mode) {
super();
this.account = account;
this.group = group;
this.mode = mode;
}
@Override
public boolean onMenuItemClick(MenuItem item) {
GroupManager.getInstance().setShowOfflineMode(account,
group == null ? GroupManager.IS_ACCOUNT : group, mode);
contactListAdapter.onChange();
return true;
}
}
public static Intent createPersistentIntent(Context context) { public static Intent createPersistentIntent(Context context) {
Intent intent = new Intent(context, ContactList.class); Intent intent = new Intent(context, ContactList.class);
intent.setAction("android.intent.action.MAIN"); intent.setAction("android.intent.action.MAIN");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023