use fab in choose contact activity. scan qr not yet working
This commit is contained in:
parent
ed0ba89551
commit
1efaecf745
|
@ -1,6 +1,7 @@
|
||||||
package eu.siacs.conversations.ui;
|
package eu.siacs.conversations.ui;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.databinding.DataBindingUtil;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
import android.text.TextWatcher;
|
import android.text.TextWatcher;
|
||||||
|
@ -16,11 +17,12 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import eu.siacs.conversations.R;
|
import eu.siacs.conversations.R;
|
||||||
|
import eu.siacs.conversations.databinding.ActivityChooseContactBinding;
|
||||||
import eu.siacs.conversations.entities.ListItem;
|
import eu.siacs.conversations.entities.ListItem;
|
||||||
import eu.siacs.conversations.ui.adapter.ListItemAdapter;
|
import eu.siacs.conversations.ui.adapter.ListItemAdapter;
|
||||||
|
|
||||||
public abstract class AbstractSearchableListItemActivity extends XmppActivity {
|
public abstract class AbstractSearchableListItemActivity extends XmppActivity {
|
||||||
private ListView mListView;
|
protected ActivityChooseContactBinding binding;
|
||||||
private final List<ListItem> listItems = new ArrayList<>();
|
private final List<ListItem> listItems = new ArrayList<>();
|
||||||
private ArrayAdapter<ListItem> mListItemsAdapter;
|
private ArrayAdapter<ListItem> mListItemsAdapter;
|
||||||
|
|
||||||
|
@ -74,7 +76,7 @@ public abstract class AbstractSearchableListItemActivity extends XmppActivity {
|
||||||
};
|
};
|
||||||
|
|
||||||
public ListView getListView() {
|
public ListView getListView() {
|
||||||
return mListView;
|
return binding.chooseContactList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ListItem> getListItems() {
|
public List<ListItem> getListItems() {
|
||||||
|
@ -92,11 +94,10 @@ public abstract class AbstractSearchableListItemActivity extends XmppActivity {
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(final Bundle savedInstanceState) {
|
public void onCreate(final Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_choose_contact);
|
this.binding = DataBindingUtil.setContentView(this,R.layout.activity_choose_contact);
|
||||||
mListView = (ListView) findViewById(R.id.choose_contact_list);
|
this.binding.chooseContactList.setFastScrollEnabled(true);
|
||||||
mListView.setFastScrollEnabled(true);
|
|
||||||
mListItemsAdapter = new ListItemAdapter(this, listItems);
|
mListItemsAdapter = new ListItemAdapter(this, listItems);
|
||||||
mListView.setAdapter(mListItemsAdapter);
|
this.binding.chooseContactList.setAdapter(mListItemsAdapter);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -26,17 +26,11 @@ public class BlocklistActivity extends AbstractSearchableListItemActivity implem
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(final Bundle savedInstanceState) {
|
public void onCreate(final Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
getListView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
|
getListView().setOnItemLongClickListener((parent, view, position, id) -> {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onItemLongClick(final AdapterView<?> parent,
|
|
||||||
final View view,
|
|
||||||
final int position,
|
|
||||||
final long id) {
|
|
||||||
BlockContactDialog.show(BlocklistActivity.this, (Contact) getListItems().get(position));
|
BlockContactDialog.show(BlocklistActivity.this, (Contact) getListItems().get(position));
|
||||||
return true;
|
return true;
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
this.binding.fab.setOnClickListener((v)->showEnterJidDialog());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -66,23 +60,6 @@ public class BlocklistActivity extends AbstractSearchableListItemActivity implem
|
||||||
getListItemAdapter().notifyDataSetChanged();
|
getListItemAdapter().notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(final Menu menu) {
|
|
||||||
super.onCreateOptionsMenu(menu);
|
|
||||||
menu.findItem(R.id.action_block_jid).setVisible(true);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
|
||||||
switch (item.getItemId()) {
|
|
||||||
case R.id.action_block_jid:
|
|
||||||
showEnterJidDialog();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return super.onOptionsItemSelected(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void showEnterJidDialog() {
|
protected void showEnterJidDialog() {
|
||||||
EnterJidDialog dialog = new EnterJidDialog(
|
EnterJidDialog dialog = new EnterJidDialog(
|
||||||
this, mKnownHosts, null,
|
this, mKnownHosts, null,
|
||||||
|
@ -90,15 +67,12 @@ public class BlocklistActivity extends AbstractSearchableListItemActivity implem
|
||||||
null, account.getJid().asBareJid().toString(), true
|
null, account.getJid().asBareJid().toString(), true
|
||||||
);
|
);
|
||||||
|
|
||||||
dialog.setOnEnterJidDialogPositiveListener(new EnterJidDialog.OnEnterJidDialogPositiveListener() {
|
dialog.setOnEnterJidDialogPositiveListener((accountJid, contactJid) -> {
|
||||||
@Override
|
|
||||||
public boolean onEnterJidDialogPositive(Jid accountJid, Jid contactJid) throws EnterJidDialog.JidError {
|
|
||||||
Contact contact = account.getRoster().getContact(contactJid);
|
Contact contact = account.getRoster().getContact(contactJid);
|
||||||
if (xmppConnectionService.sendBlockRequest(contact, false)) {
|
if (xmppConnectionService.sendBlockRequest(contact, false)) {
|
||||||
Toast.makeText(BlocklistActivity.this, R.string.corresponding_conversations_closed, Toast.LENGTH_SHORT).show();
|
Toast.makeText(BlocklistActivity.this, R.string.corresponding_conversations_closed, Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
dialog.show();
|
dialog.show();
|
||||||
|
|
|
@ -13,7 +13,6 @@ import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.inputmethod.InputMethodManager;
|
import android.view.inputmethod.InputMethodManager;
|
||||||
import android.widget.AbsListView.MultiChoiceModeListener;
|
import android.widget.AbsListView.MultiChoiceModeListener;
|
||||||
import android.widget.AdapterView;
|
|
||||||
import android.widget.ListView;
|
import android.widget.ListView;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -32,12 +31,32 @@ import eu.siacs.conversations.entities.MucOptions;
|
||||||
import rocks.xmpp.addr.Jid;
|
import rocks.xmpp.addr.Jid;
|
||||||
|
|
||||||
public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
|
public static final String EXTRA_TITLE_RES_ID = "extra_title_res_id";
|
||||||
private List<String> mActivatedAccounts = new ArrayList<>();
|
private List<String> mActivatedAccounts = new ArrayList<>();
|
||||||
private List<String> mKnownHosts;
|
private List<String> mKnownHosts;
|
||||||
|
|
||||||
private Set<Contact> selected;
|
private Set<Contact> selected;
|
||||||
private Set<String> filterContacts;
|
private Set<String> filterContacts;
|
||||||
public static final String EXTRA_TITLE_RES_ID = "extra_title_res_id";
|
|
||||||
|
public static Intent create(Activity activity, Conversation conversation) {
|
||||||
|
final Intent intent = new Intent(activity, ChooseContactActivity.class);
|
||||||
|
List<String> contacts = new ArrayList<>();
|
||||||
|
if (conversation.getMode() == Conversation.MODE_MULTI) {
|
||||||
|
for (MucOptions.User user : conversation.getMucOptions().getUsers(false)) {
|
||||||
|
Jid jid = user.getRealJid();
|
||||||
|
if (jid != null) {
|
||||||
|
contacts.add(jid.asBareJid().toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
contacts.add(conversation.getJid().asBareJid().toString());
|
||||||
|
}
|
||||||
|
intent.putExtra("filter_contacts", contacts.toArray(new String[contacts.size()]));
|
||||||
|
intent.putExtra("conversation", conversation.getUuid());
|
||||||
|
intent.putExtra("multiple", true);
|
||||||
|
intent.putExtra("show_enter_jid", true);
|
||||||
|
intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString());
|
||||||
|
return intent;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(final Bundle savedInstanceState) {
|
public void onCreate(final Bundle savedInstanceState) {
|
||||||
|
@ -60,8 +79,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
|
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
|
||||||
final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
|
final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
|
||||||
imm.hideSoftInputFromWindow(getSearchEditText().getWindowToken(),
|
imm.hideSoftInputFromWindow(getSearchEditText().getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY);
|
||||||
InputMethodManager.HIDE_IMPLICIT_ONLY);
|
|
||||||
MenuInflater inflater = getMenuInflater();
|
MenuInflater inflater = getMenuInflater();
|
||||||
inflater.inflate(R.menu.select_multiple, menu);
|
inflater.inflate(R.menu.select_multiple, menu);
|
||||||
selected = new HashSet<>();
|
selected = new HashSet<>();
|
||||||
|
@ -109,14 +127,9 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
getListView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
getListView().setOnItemClickListener((parent, view, position, id) -> {
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onItemClick(final AdapterView<?> parent, final View view,
|
|
||||||
final int position, final long id) {
|
|
||||||
final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
|
final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
|
||||||
imm.hideSoftInputFromWindow(getSearchEditText().getWindowToken(),
|
imm.hideSoftInputFromWindow(getSearchEditText().getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY);
|
||||||
InputMethodManager.HIDE_IMPLICIT_ONLY);
|
|
||||||
final Intent request = getIntent();
|
final Intent request = getIntent();
|
||||||
final Intent data = new Intent();
|
final Intent data = new Intent();
|
||||||
final ListItem mListItem = getListItems().get(position);
|
final ListItem mListItem = getListItems().get(position);
|
||||||
|
@ -126,15 +139,19 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
account = ((Contact) mListItem).getAccount().getJid().asBareJid().toString();
|
account = ((Contact) mListItem).getAccount().getJid().asBareJid().toString();
|
||||||
}
|
}
|
||||||
data.putExtra(EXTRA_ACCOUNT, account);
|
data.putExtra(EXTRA_ACCOUNT, account);
|
||||||
data.putExtra("conversation",
|
data.putExtra("conversation", request.getStringExtra("conversation"));
|
||||||
request.getStringExtra("conversation"));
|
|
||||||
data.putExtra("multiple", false);
|
data.putExtra("multiple", false);
|
||||||
data.putExtra("subject", request.getStringExtra("subject"));
|
data.putExtra("subject", request.getStringExtra("subject"));
|
||||||
setResult(RESULT_OK, data);
|
setResult(RESULT_OK, data);
|
||||||
finish();
|
finish();
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
final Intent i = getIntent();
|
||||||
|
boolean showEnterJid = i != null && i.getBooleanExtra("show_enter_jid", false);
|
||||||
|
if (showEnterJid) {
|
||||||
|
this.binding.fab.setOnClickListener((v) -> showEnterJidDialog());
|
||||||
|
} else {
|
||||||
|
this.binding.fab.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -158,7 +175,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
super.onCreateOptionsMenu(menu);
|
super.onCreateOptionsMenu(menu);
|
||||||
final Intent i = getIntent();
|
final Intent i = getIntent();
|
||||||
boolean showEnterJid = i != null && i.getBooleanExtra("show_enter_jid", false);
|
boolean showEnterJid = i != null && i.getBooleanExtra("show_enter_jid", false);
|
||||||
menu.findItem(R.id.action_create_contact).setVisible(showEnterJid);
|
menu.findItem(R.id.action_scan_qr_code).setVisible(showEnterJid);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -191,7 +208,6 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
return result.toArray(new String[result.size()]);
|
return result.toArray(new String[result.size()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void refreshUiReal() {
|
public void refreshUiReal() {
|
||||||
//nothing to do. This Activity doesn't implement any listeners
|
//nothing to do. This Activity doesn't implement any listeners
|
||||||
}
|
}
|
||||||
|
@ -199,8 +215,8 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
case R.id.action_create_contact:
|
case R.id.action_scan_qr_code:
|
||||||
showEnterJidDialog();
|
ScanActivity.scan(this);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
|
@ -213,9 +229,7 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
null, getIntent().getStringExtra(EXTRA_ACCOUNT), true
|
null, getIntent().getStringExtra(EXTRA_ACCOUNT), true
|
||||||
);
|
);
|
||||||
|
|
||||||
dialog.setOnEnterJidDialogPositiveListener(new EnterJidDialog.OnEnterJidDialogPositiveListener() {
|
dialog.setOnEnterJidDialogPositiveListener((accountJid, contactJid) -> {
|
||||||
@Override
|
|
||||||
public boolean onEnterJidDialogPositive(Jid accountJid, Jid contactJid) throws EnterJidDialog.JidError {
|
|
||||||
final Intent request = getIntent();
|
final Intent request = getIntent();
|
||||||
final Intent data = new Intent();
|
final Intent data = new Intent();
|
||||||
data.putExtra("contact", contactJid.toString());
|
data.putExtra("contact", contactJid.toString());
|
||||||
|
@ -228,7 +242,6 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
finish();
|
finish();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
dialog.show();
|
dialog.show();
|
||||||
|
@ -249,25 +262,4 @@ public class ChooseContactActivity extends AbstractSearchableListItemActivity {
|
||||||
}
|
}
|
||||||
this.mKnownHosts = xmppConnectionService.getKnownHosts();
|
this.mKnownHosts = xmppConnectionService.getKnownHosts();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Intent create(Activity activity, Conversation conversation) {
|
|
||||||
final Intent intent = new Intent(activity, ChooseContactActivity.class);
|
|
||||||
List<String> contacts = new ArrayList<>();
|
|
||||||
if (conversation.getMode() == Conversation.MODE_MULTI) {
|
|
||||||
for (MucOptions.User user : conversation.getMucOptions().getUsers(false)) {
|
|
||||||
Jid jid = user.getRealJid();
|
|
||||||
if (jid != null) {
|
|
||||||
contacts.add(jid.asBareJid().toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
contacts.add(conversation.getJid().asBareJid().toString());
|
|
||||||
}
|
|
||||||
intent.putExtra("filter_contacts", contacts.toArray(new String[contacts.size()]));
|
|
||||||
intent.putExtra("conversation", conversation.getUuid());
|
|
||||||
intent.putExtra("multiple", true);
|
|
||||||
intent.putExtra("show_enter_jid", true);
|
|
||||||
intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().asBareJid().toString());
|
|
||||||
return intent;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<layout xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
|
<FrameLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="?attr/color_background_primary">
|
android:background="?attr/color_background_primary">
|
||||||
|
@ -9,8 +10,15 @@
|
||||||
android:id="@+id/choose_contact_list"
|
android:id="@+id/choose_contact_list"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:listitem="@layout/contact"
|
|
||||||
android:divider="@android:color/transparent"
|
android:divider="@android:color/transparent"
|
||||||
android:dividerHeight="0dp"/>
|
android:dividerHeight="0dp"/>
|
||||||
|
|
||||||
</LinearLayout>
|
<android.support.design.widget.FloatingActionButton
|
||||||
|
android:id="@+id/fab"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="end|bottom"
|
||||||
|
android:layout_margin="16dp"
|
||||||
|
android:src="@drawable/ic_person_add_white_24dp"/>
|
||||||
|
</FrameLayout>
|
||||||
|
</layout>
|
|
@ -8,18 +8,10 @@
|
||||||
android:icon="?attr/icon_search"
|
android:icon="?attr/icon_search"
|
||||||
app:showAsAction="collapseActionView|always"
|
app:showAsAction="collapseActionView|always"
|
||||||
android:title="@string/search"/>
|
android:title="@string/search"/>
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/action_create_contact"
|
android:id="@+id/action_scan_qr_code"
|
||||||
android:icon="?attr/icon_add_person"
|
android:title="@string/scan_qr_code"
|
||||||
|
android:icon="?attr/icon_scan_qr_code"
|
||||||
app:showAsAction="always"
|
app:showAsAction="always"
|
||||||
android:title="@string/create_contact"
|
|
||||||
android:visible="false"/>
|
|
||||||
|
|
||||||
<item
|
|
||||||
android:id="@+id/action_block_jid"
|
|
||||||
android:icon="?attr/icon_add_person"
|
|
||||||
app:showAsAction="always"
|
|
||||||
android:title="@string/block_jabber_id"
|
|
||||||
android:visible="false"/>
|
android:visible="false"/>
|
||||||
</menu>
|
</menu>
|
||||||
|
|
Loading…
Reference in New Issue