From 157d77d14ac69835e23c1f1cdd98c457299f9024 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Tue, 6 Dec 2011 13:05:20 -0800 Subject: [PATCH] Updated default person and unassigned images --- .../astrid/actfm/EditPeopleControlSet.java | 9 ++++++--- .../todoroo/astrid/actfm/TagViewActivity.java | 2 +- astrid/res/drawable/icn_anyone.png | Bin 0 -> 2731 bytes astrid/res/drawable/icn_default_person_image.png | Bin 0 -> 4751 bytes astrid/res/layout/assigned_adapter_row.xml | 2 +- astrid/res/layout/contact_adapter_row.xml | 2 +- astrid/res/layout/task_adapter_draggable_row.xml | 2 +- astrid/res/layout/task_adapter_row.xml | 2 +- astrid/res/layout/update_adapter_row.xml | 2 +- .../todoroo/astrid/ui/ContactListAdapter.java | 2 +- 10 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 astrid/res/drawable/icn_anyone.png create mode 100644 astrid/res/drawable/icn_default_person_image.png diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java index ef0cd8313..0f22a0661 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java @@ -389,10 +389,13 @@ public class EditPeopleControlSet extends PopupControlSet { CheckedTextView ctv = (CheckedTextView) convertView.findViewById(android.R.id.text1); super.getView(position, ctv, parent); AsyncImageView image = (AsyncImageView) convertView.findViewById(R.id.person_image); - if (position <= 1) { - image.setVisibility(View.GONE); + image.setDefaultImageResource(R.drawable.icn_default_person_image); + if (position == 0) { + image.setUrl(ActFmPreferenceService.thisUser().optString("picture")); + } else if (position == 1) { + image.setUrl(""); + image.setDefaultImageResource(R.drawable.icn_anyone); } else { - image.setVisibility(View.VISIBLE); image.setUrl(getItem(position).user.optString("picture")); } return convertView; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java index 3021f043c..e0d5c93c3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java @@ -378,7 +378,7 @@ public class TagViewActivity extends TaskListActivity { AsyncImageView image = new AsyncImageView(this); image.setLayoutParams(new LinearLayout.LayoutParams((int)(50 * displayMetrics.density), (int)(50 * displayMetrics.density))); - image.setDefaultImageResource(R.drawable.ic_contact_picture_2); + image.setDefaultImageResource(R.drawable.icn_default_person_image); image.setScaleType(ImageView.ScaleType.FIT_XY); try { final long id = member.getLong("id"); diff --git a/astrid/res/drawable/icn_anyone.png b/astrid/res/drawable/icn_anyone.png new file mode 100644 index 0000000000000000000000000000000000000000..fa830dcd46a2282278dbd3c9d782ae911c9199ff GIT binary patch literal 2731 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 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/icn_default_person_image.png b/astrid/res/drawable/icn_default_person_image.png new file mode 100644 index 0000000000000000000000000000000000000000..22b6fb98778383ecea972a1e4cbae6d783a6a917 GIT binary patch literal 4751 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 P@d0&Z9i + astrid:defaultSrc="@drawable/icn_default_person_image" /> diff --git a/astrid/res/layout/contact_adapter_row.xml b/astrid/res/layout/contact_adapter_row.xml index ef2979ced..e74602664 100644 --- a/astrid/res/layout/contact_adapter_row.xml +++ b/astrid/res/layout/contact_adapter_row.xml @@ -15,7 +15,7 @@ android:layout_height="44dip" android:gravity="center" android:scaleType="fitCenter" - astrid:defaultSrc="@drawable/ic_contact_picture_2" /> + astrid:defaultSrc="@drawable/icn_default_person_image" /> diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml index af17dfc0b..b78ca46e5 100644 --- a/astrid/res/layout/task_adapter_row.xml +++ b/astrid/res/layout/task_adapter_row.xml @@ -56,7 +56,7 @@ android:layout_height="35dip" android:padding="5dip" android:scaleType="fitCenter" - astrid:defaultSrc="@drawable/ic_contact_picture_2" + astrid:defaultSrc="@drawable/icn_default_person_image" android:visibility="gone"/> diff --git a/astrid/res/layout/update_adapter_row.xml b/astrid/res/layout/update_adapter_row.xml index cc0953e4d..b15a90444 100644 --- a/astrid/res/layout/update_adapter_row.xml +++ b/astrid/res/layout/update_adapter_row.xml @@ -22,7 +22,7 @@ android:layout_alignParentTop="true" android:layout_alignParentLeft="true" android:paddingTop="5dip" - astrid:defaultSrc="@drawable/ic_contact_picture_2" + astrid:defaultSrc="@drawable/icn_default_person_image" android:scaleType="fitCenter" /> diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java index 99e77b435..a7b48ba77 100644 --- a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java +++ b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java @@ -82,7 +82,7 @@ public class ContactListAdapter extends CursorAdapter { text1.setText(cursor.getString(name)); text2.setText(cursor.getString(email)); } - imageView.setImageResource(R.drawable.ic_contact_picture_2); + imageView.setImageResource(R.drawable.icn_default_person_image); Uri uri = ContentUris.withAppendedId(ContactsContract.Contacts.CONTENT_URI, cursor.getLong(0)); imageView.setTag(uri); ContactImageTask ciTask = new ContactImageTask(imageView);