Skip to content

X
xabber-android
Commit c0f6e151 authored by Grigory Fedorov's avatar Grigory Fedorov
Browse files
Options

Merge branch 'feature/options_menu' into develop

parents 155af8df 06010393
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 861 additions and 717 deletions
app/src/main/java/com/xabber/android/ui/ContactList.java
View file @ c0f6e151
...@@ -80,15 +80,6 @@ public class ContactList extends ManagedActivity implements OnChoosedListener, O ...@@ -80,15 +80,6 @@ public class ContactList extends ManagedActivity implements OnChoosedListener, O
private static final String SAVED_ACTION = "com.xabber.android.ui.ContactList.SAVED_ACTION"; private static final String SAVED_ACTION = "com.xabber.android.ui.ContactList.SAVED_ACTION";
private static final String SAVED_SEND_TEXT = "com.xabber.android.ui.ContactList.SAVED_SEND_TEXT"; private static final String SAVED_SEND_TEXT = "com.xabber.android.ui.ContactList.SAVED_SEND_TEXT";
private static final int OPTION_MENU_ADD_CONTACT_ID = 0x02;
private static final int OPTION_MENU_STATUS_EDITOR_ID = 0x04;
private static final int OPTION_MENU_PREFERENCE_EDITOR_ID = 0x05;
private static final int OPTION_MENU_CHAT_LIST_ID = 0x06;
private static final int OPTION_MENU_JOIN_ROOM_ID = 0x07;
private static final int OPTION_MENU_EXIT_ID = 0x08;
private static final int OPTION_MENU_SEARCH_ID = 0x0A;
private static final int OPTION_MENU_CLOSE_CHATS_ID = 0x0B;
private static final int DIALOG_CLOSE_APPLICATION_ID = 0x57; private static final int DIALOG_CLOSE_APPLICATION_ID = 0x57;
private static final String CONTACT_LIST_TAG = "CONTACT_LIST"; private static final String CONTACT_LIST_TAG = "CONTACT_LIST";
...@@ -270,80 +261,70 @@ public class ContactList extends ManagedActivity implements OnChoosedListener, O ...@@ -270,80 +261,70 @@ public class ContactList extends ManagedActivity implements OnChoosedListener, O
super.onPause(); super.onPause();
} }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
menu.add(0, OPTION_MENU_ADD_CONTACT_ID, 0, getMenuInflater().inflate(R.menu.contact_list, menu);
getText(R.string.contact_add)).setIcon( return true;
R.drawable.ic_menu_invite); }
menu.add(0, OPTION_MENU_CLOSE_CHATS_ID, 0,
getText(R.string.close_chats)).setIcon( @Override
R.drawable.ic_menu_end_conversation); public boolean onOptionsItemSelected(MenuItem item) {
menu.add(0, OPTION_MENU_PREFERENCE_EDITOR_ID, 0, switch (item.getItemId()) {
getResources().getText(R.string.preference_editor)).setIcon( case R.id.action_search:
android.R.drawable.ic_menu_preferences); search();
menu.add(0, OPTION_MENU_STATUS_EDITOR_ID, 0, return true;
getText(R.string.status_editor)).setIcon( case R.id.action_change_status:
R.drawable.ic_menu_notifications); startActivity(StatusEditor.createIntent(this));
menu.add(0, OPTION_MENU_EXIT_ID, 0, getText(R.string.exit)).setIcon( return true;
android.R.drawable.ic_menu_close_clear_cancel); case R.id.action_add_contact:
menu.add(0, OPTION_MENU_JOIN_ROOM_ID, 0, getText(R.string.muc_add)); startActivity(ContactAdd.createIntent(this));
menu.add(0, OPTION_MENU_SEARCH_ID, 0, return true;
getText(android.R.string.search_go)); case R.id.action_close_chats:
menu.add(0, OPTION_MENU_CHAT_LIST_ID, 0, getText(R.string.chat_list)) closeAllChats();
.setIcon(R.drawable.ic_menu_friendslist); return true;
return true; case R.id.action_join_conference:
} startActivity(MUCEditor.createIntent(this));
return true;
@Override case R.id.action_chat_list:
public boolean onOptionsItemSelected(MenuItem item) { startActivity(ChatList.createIntent(this));
super.onOptionsItemSelected(item); return true;
switch (item.getItemId()) { case R.id.action_settings:
case OPTION_MENU_ADD_CONTACT_ID: startActivity(PreferenceEditor.createIntent(this));
startActivity(ContactAdd.createIntent(this)); return true;
return true; case R.id.action_exit:
case OPTION_MENU_STATUS_EDITOR_ID: exit();
startActivity(StatusEditor.createIntent(this)); return true;
return true; default:
case OPTION_MENU_PREFERENCE_EDITOR_ID: return super.onOptionsItemSelected(item);
startActivity(PreferenceEditor.createIntent(this)); }
return true; }
case OPTION_MENU_CHAT_LIST_ID:
startActivity(ChatList.createIntent(this)); private void exit() {
return true; Application.getInstance().requestToClose();
case OPTION_MENU_JOIN_ROOM_ID: showDialog(DIALOG_CLOSE_APPLICATION_ID);
startActivity(MUCEditor.createIntent(this)); getContactListFragment().unregisterListeners();
return true; new Handler().postDelayed(new Runnable() {
case OPTION_MENU_EXIT_ID: @Override
Application.getInstance().requestToClose(); public void run() {
showDialog(DIALOG_CLOSE_APPLICATION_ID); // Close activity if application was not killed yet.
getContactListFragment().unregisterListeners(); finish();
new Handler().postDelayed(new Runnable() { }
@Override }, CLOSE_ACTIVITY_AFTER_DELAY);
public void run() { }
// Close activity if application was not killed yet.
finish(); private void closeAllChats() {
} for (AbstractChat chat : MessageManager.getInstance()
}, CLOSE_ACTIVITY_AFTER_DELAY); .getActiveChats()) {
return true; MessageManager.getInstance().closeChat(chat.getAccount(),
case OPTION_MENU_SEARCH_ID: chat.getUser());
search(); NotificationManager.getInstance().removeMessageNotification(
return true; chat.getAccount(), chat.getUser());
case OPTION_MENU_CLOSE_CHATS_ID: }
for (AbstractChat chat : MessageManager.getInstance() getContactListFragment().getAdapter().onChange();
.getActiveChats()) { }
MessageManager.getInstance().closeChat(chat.getAccount(),
chat.getUser());
NotificationManager.getInstance().removeMessageNotification(
chat.getAccount(), chat.getUser());
}
getContactListFragment().getAdapter().onChange();
return true;
}
return false;
}
private ContactListFragment getContactListFragment() { private ContactListFragment getContactListFragment() {
return (ContactListFragment) getSupportFragmentManager() return (ContactListFragment) getSupportFragmentManager()
.findFragmentByTag(CONTACT_LIST_TAG); .findFragmentByTag(CONTACT_LIST_TAG);
} }
......
app/src/main/java/com/xabber/android/ui/GroupListActivity.java
View file @ c0f6e151
...@@ -46,9 +46,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements ...@@ -46,9 +46,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements
private static final String SAVED_GROUPS = "com.xabber.android.ui.ContactList.SAVED_GROUPS"; private static final String SAVED_GROUPS = "com.xabber.android.ui.ContactList.SAVED_GROUPS";
private static final String SAVED_SELECTED = "com.xabber.android.ui.ContactList.SAVED_SELECTED"; private static final String SAVED_SELECTED = "com.xabber.android.ui.ContactList.SAVED_SELECTED";
static final int OPTION_MENU_ADD_GROUP_ID = 1; private ArrayAdapter<String> arrayAdapter;
private ArrayAdapter<String> arrayAdapter;
private ListView listView; private ListView listView;
...@@ -73,7 +71,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements ...@@ -73,7 +71,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements
listView = getListView(); listView = getListView();
listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); listView.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
listView.setOnItemClickListener(this); listView.setOnItemClickListener(this);
arrayAdapter = new ArrayAdapter<String>(this, arrayAdapter = new ArrayAdapter<>(this,
android.R.layout.simple_list_item_multiple_choice, android.R.layout.simple_list_item_multiple_choice,
new ArrayList<String>()); new ArrayList<String>());
LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE); LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
...@@ -113,7 +111,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements ...@@ -113,7 +111,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements
* @return Actual groups from adapter. * @return Actual groups from adapter.
*/ */
private ArrayList<String> getGroups() { private ArrayList<String> getGroups() {
ArrayList<String> groups = new ArrayList<String>(); ArrayList<String> groups = new ArrayList<>();
for (int position = 0; position < arrayAdapter.getCount(); position++) for (int position = 0; position < arrayAdapter.getCount(); position++)
groups.add(arrayAdapter.getItem(position)); groups.add(arrayAdapter.getItem(position));
return groups; return groups;
...@@ -123,7 +121,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements ...@@ -123,7 +121,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements
* @return Actual selected groups from adapter. * @return Actual selected groups from adapter.
*/ */
public ArrayList<String> getSelected() { public ArrayList<String> getSelected() {
ArrayList<String> groups = new ArrayList<String>(); ArrayList<String> groups = new ArrayList<>();
for (int position = 0; position < arrayAdapter.getCount(); position++) for (int position = 0; position < arrayAdapter.getCount(); position++)
if (listView.isItemChecked(position if (listView.isItemChecked(position
+ listView.getHeaderViewsCount())) { + listView.getHeaderViewsCount())) {
...@@ -132,23 +130,21 @@ public abstract class GroupListActivity extends ManagedListActivity implements ...@@ -132,23 +130,21 @@ public abstract class GroupListActivity extends ManagedListActivity implements
return groups; return groups;
} }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
menu.add(0, OPTION_MENU_ADD_GROUP_ID, 0, getMenuInflater().inflate(R.menu.create_new_group, menu);
getResources().getText(R.string.group_add)).setIcon( return true;
android.R.drawable.ic_menu_add); }
return true;
} @Override
public boolean onOptionsItemSelected(MenuItem item) {
@Override switch (item.getItemId()) {
public boolean onOptionsItemSelected(MenuItem item) { case R.id.action_create_new_group:
switch (item.getItemId()) { showGroupAddDialog();
case OPTION_MENU_ADD_GROUP_ID: return true;
showGroupAddDialog(); }
return true; return false;
} }
return false;
}
private void showGroupAddDialog() { private void showGroupAddDialog() {
GroupAddDialogFragment.newInstance(getGroups()).show( GroupAddDialogFragment.newInstance(getGroups()).show(
...@@ -169,7 +165,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements ...@@ -169,7 +165,7 @@ public abstract class GroupListActivity extends ManagedListActivity implements
* @param selected * @param selected
*/ */
void setGroups(Collection<String> groups, Collection<String> selected) { void setGroups(Collection<String> groups, Collection<String> selected) {
ArrayList<String> list = new ArrayList<String>(groups); ArrayList<String> list = new ArrayList<>(groups);
Collections.sort(list); Collections.sort(list);
arrayAdapter.clear(); arrayAdapter.clear();
for (int position = 0; position < list.size(); position++) { for (int position = 0; position < list.size(); position++) {
......
app/src/main/java/com/xabber/android/ui/StatusEditor.java
View file @ c0f6e151
...@@ -26,7 +26,6 @@ import android.view.View; ...@@ -26,7 +26,6 @@ import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemClickListener;
import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ListView; import android.widget.ListView;
import android.widget.Spinner; import android.widget.Spinner;
...@@ -49,9 +48,7 @@ public class StatusEditor extends ManagedListActivity implements ...@@ -49,9 +48,7 @@ public class StatusEditor extends ManagedListActivity implements
private static final String SAVED_TEXT = "com.xabber.android.ui.StatusEditor.SAVED_TEXT"; private static final String SAVED_TEXT = "com.xabber.android.ui.StatusEditor.SAVED_TEXT";
private static final String SAVED_MODE = "com.xabber.android.ui.StatusEditor.SAVED_MODE"; private static final String SAVED_MODE = "com.xabber.android.ui.StatusEditor.SAVED_MODE";
static final public int OPTION_MENU_CLEAR_STATUSES_ID = 1; static final public int CONTEXT_MENU_SELECT_STATUS_ID = 10;
static final public int CONTEXT_MENU_SELECT_STATUS_ID = 10;
static final public int CONTEXT_MENU_EDIT_STATUS_ID = 11; static final public int CONTEXT_MENU_EDIT_STATUS_ID = 11;
static final public int CONTEXT_MENU_REMOVE_STATUS_ID = 12; static final public int CONTEXT_MENU_REMOVE_STATUS_ID = 12;
...@@ -95,7 +92,7 @@ public class StatusEditor extends ManagedListActivity implements ...@@ -95,7 +92,7 @@ public class StatusEditor extends ManagedListActivity implements
statusTextView = (EditText) header.findViewById(R.id.status_text); statusTextView = (EditText) header.findViewById(R.id.status_text);
statusModeView = (Spinner) header.findViewById(R.id.status_mode); statusModeView = (Spinner) header.findViewById(R.id.status_mode);
statusModeView.setAdapter(new StatusModeAdapter(this)); statusModeView.setAdapter(new StatusModeAdapter(this));
((Button) findViewById(R.id.ok)).setOnClickListener(this); findViewById(R.id.ok).setOnClickListener(this);
StatusMode statusMode; StatusMode statusMode;
String statusText; String statusText;
...@@ -152,26 +149,26 @@ public class StatusEditor extends ManagedListActivity implements ...@@ -152,26 +149,26 @@ public class StatusEditor extends ManagedListActivity implements
adapter.onChange(); adapter.onChange();
} }
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
menu.add(0, OPTION_MENU_CLEAR_STATUSES_ID, 0, getMenuInflater().inflate(R.menu.delete_status_message, menu);
getResources().getText(R.string.clear_statuses)).setIcon(
android.R.drawable.ic_menu_close_clear_cancel);
return true; return true;
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
switch (item.getItemId()) { switch (item.getItemId()) {
case OPTION_MENU_CLEAR_STATUSES_ID: case R.id.action_delete_status_message:
AccountManager.getInstance().clearSavedStatuses(); AccountManager.getInstance().clearSavedStatuses();
adapter.onChange(); adapter.onChange();
return true; return true;
} }
return false; return false;
} }
@Override @Override
public void onCreateContextMenu(ContextMenu menu, View v, public void onCreateContextMenu(ContextMenu menu, View v,
......
app/src/main/res/menu/chat.xml 0 → 100644
View file @ c0f6e151
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_join_conference"
android:title="@string/muc_join"
app:showAsAction="ifRoom"
android:orderInCategory="80"
android:visible="false"
android:icon="@drawable/ic_group_white_24dp"
/>
<item android:id="@+id/action_invite_to_chat"
android:title="@string/muc_invite"
app:showAsAction="never"
android:orderInCategory="90"
android:visible="false"
/>
<item android:id="@+id/action_edit_contact"
android:title="@string/contact_editor"
app:showAsAction="ifRoom"
android:orderInCategory="100"
android:visible="false"
android:icon="@drawable/ic_create_white_24dp"
/>
<item android:id="@+id/action_chat_list"
android:title="@string/chat_list"
app:showAsAction="never"
android:orderInCategory="110"
/>
<item android:id="@+id/action_chat_settings"
android:title="@string/chat_settings"
app:showAsAction="never"
android:orderInCategory="120"
/>
<item android:id="@+id/action_show_history"
android:title="@string/show_history"
app:showAsAction="never"
android:orderInCategory="130"
/>
<item android:id="@+id/action_authorization_settings"
android:title="@string/muc_edit"
app:showAsAction="never"
android:orderInCategory="133"
android:visible="false"
/>
<item android:id="@+id/action_leave_conference"
android:title="@string/muc_leave"
app:showAsAction="never"
android:orderInCategory="136"
android:visible="false"
/>
<item android:id="@+id/action_close_chat"
android:title="@string/close_chat"
app:showAsAction="ifRoom"
android:orderInCategory="140"
android:visible="false"
android:icon="@drawable/ic_clear_white_24dp"
/>
<item android:id="@+id/action_clear_text"
android:title="@string/clear_message"
app:showAsAction="never"
android:orderInCategory="150"
/>
<item android:id="@+id/action_clear_history"
android:title="@string/clear_history"
app:showAsAction="never"
android:orderInCategory="160"
/>
<item android:id="@+id/action_export_chat"
android:title="@string/export_chat"
app:showAsAction="never"
android:orderInCategory="170"
/>
<item android:id="@+id/action_call_attention"
android:title="@string/call_attention"
app:showAsAction="never"
android:orderInCategory="180"
/>
<item android:id="@+id/action_otr_encryption"
android:title="@string/otr_encryption"
app:showAsAction="never"
android:orderInCategory="190">
<menu>
<item android:id="@+id/action_start_encryption"
android:title="@string/otr_start"
app:showAsAction="never"
android:orderInCategory="100"
android:visible="false"
/>
<item android:id="@+id/action_restart_encryption"
android:title="@string/otr_refresh"
app:showAsAction="never"
android:orderInCategory="105"
android:visible="false"
/>
<item android:id="@+id/action_stop_encryption"
android:title="@string/otr_end"
app:showAsAction="never"
android:orderInCategory="110"
/>
<item android:id="@+id/action_verify_with_fingerprint"
android:title="@string/otr_verify_fingerprint"
app:showAsAction="never"
android:orderInCategory="120"
/>
<item android:id="@+id/action_verify_with_question"
android:title="@string/otr_verify_question"
app:showAsAction="never"
android:orderInCategory="130"
/>
<item android:id="@+id/action_verify_with_shared_secret"
android:title="@string/otr_verify_secret"
app:showAsAction="never"
android:orderInCategory="140"
/>
</menu>
</item>
<item android:id="@+id/action_list_of_occupants"
android:title="@string/occupant_list"
app:showAsAction="never"
android:orderInCategory="200"
android:visible="false"
/>
</menu>
\ No newline at end of file
app/src/main/res/menu/contact_list.xml 0 → 100644
View file @ c0f6e151
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_search"
android:title="@android:string/search_go"
app:showAsAction="always"
android:orderInCategory="100"
android:icon="@drawable/ic_search_white_24dp"
/>
<item android:id="@+id/action_add_contact"
android:title="@string/contact_add"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_person_add_white_24dp"
android:orderInCategory="110"
/>
<item android:id="@+id/action_join_conference"
android:title="@string/muc_add"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_group_white_24dp"
android:orderInCategory="120"
/>
<item android:id="@+id/action_change_status"
android:title="@string/status_editor"
app:showAsAction="never"
android:orderInCategory="130"
/>
<item android:id="@+id/action_chat_list"
android:title="@string/chat_list"
app:showAsAction="never"
android:orderInCategory="140"
/>
<item android:id="@+id/action_close_chats"
android:title="@string/close_chats"
app:showAsAction="never"
android:orderInCategory="150"
/>
<item android:id="@+id/action_settings"
android:title="@string/preference_editor"
app:showAsAction="never"
android:orderInCategory="160"
android:icon="@drawable/ic_settings_white_24dp"
/>
<item android:id="@+id/action_exit"
android:title="@string/exit"
app:showAsAction="never"
android:orderInCategory="200"
/>
</menu>
\ No newline at end of file
app/src/main/res/menu/create_new_group.xml 0 → 100644
View file @ c0f6e151
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_create_new_group"
android:title="@string/group_add"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_group_add_white_24dp"
android:orderInCategory="100"
/>
</menu>
\ No newline at end of file
app/src/main/res/menu/delete_status_message.xml 0 → 100644
View file @ c0f6e151
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/action_delete_status_message"
android:title="@string/clear_statuses"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_delete_white_24dp"
android:orderInCategory="100"
/>
</menu>
\ No newline at end of file
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