mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Extended contact group info

This commit is contained in:
M66B 2020-05-14 08:19:35 +02:00
parent c862dd3243
commit 34f148d02a
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -155,6 +155,7 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.text.Collator; import java.text.Collator;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.NumberFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -4646,16 +4647,20 @@ public class FragmentCompose extends FragmentBase {
final long working = getArguments().getLong("working"); final long working = getArguments().getLong("working");
int focussed = getArguments().getInt("focussed"); int focussed = getArguments().getInt("focussed");
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_contact_group, null); final Context context = getContext();
View dview = LayoutInflater.from(context).inflate(R.layout.dialog_contact_group, null);
final Spinner spGroup = dview.findViewById(R.id.spGroup); final Spinner spGroup = dview.findViewById(R.id.spGroup);
final Spinner spTarget = dview.findViewById(R.id.spTarget); final Spinner spTarget = dview.findViewById(R.id.spTarget);
Cursor groups = getContext().getContentResolver().query( Cursor groups = context.getContentResolver().query(
ContactsContract.Groups.CONTENT_SUMMARY_URI, ContactsContract.Groups.CONTENT_SUMMARY_URI,
new String[]{ new String[]{
ContactsContract.Groups._ID, ContactsContract.Groups._ID,
ContactsContract.Groups.TITLE, ContactsContract.Groups.TITLE,
ContactsContract.Groups.SUMMARY_COUNT ContactsContract.Groups.SUMMARY_COUNT,
ContactsContract.Groups.ACCOUNT_NAME,
ContactsContract.Groups.ACCOUNT_TYPE,
}, },
ContactsContract.Groups.DELETED + " = 0" + ContactsContract.Groups.DELETED + " = 0" +
" AND " + ContactsContract.Groups.SUMMARY_COUNT + " > 0", " AND " + ContactsContract.Groups.SUMMARY_COUNT + " > 0",
@ -4664,17 +4669,38 @@ public class FragmentCompose extends FragmentBase {
); );
SimpleCursorAdapter adapter = new SimpleCursorAdapter( SimpleCursorAdapter adapter = new SimpleCursorAdapter(
getContext(), context,
R.layout.spinner_item1_dropdown, R.layout.spinner_contact_group,
groups, groups,
new String[]{ContactsContract.Groups.TITLE}, new String[]{ContactsContract.Groups.TITLE, ContactsContract.Groups.ACCOUNT_NAME},
new int[]{android.R.id.text1}, new int[]{R.id.tvGroup, R.id.tvAccount},
0); 0);
final NumberFormat NF = NumberFormat.getInstance();
adapter.setViewBinder(new SimpleCursorAdapter.ViewBinder() {
@Override
public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
if (view.getId() == R.id.tvGroup) {
String title = cursor.getString(1);
int count = cursor.getInt(2);
((TextView) view).setText(context.getString(R.string.title_name_count, title, NF.format(count)));
return true;
} else if (view.getId() == R.id.tvAccount && BuildConfig.DEBUG) {
String account = cursor.getString(3);
String type = cursor.getString(4);
((TextView) view).setText(account + ":" + type);
return true;
} else
return false;
}
});
spGroup.setAdapter(adapter); spGroup.setAdapter(adapter);
spTarget.setSelection(focussed); spTarget.setSelection(focussed);
return new AlertDialog.Builder(getContext()) return new AlertDialog.Builder(context)
.setView(dview) .setView(dview)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override @Override