From 901ce085a7df579b9c8c402b8af59a7ce7233044 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Sun, 13 Apr 2014 20:41:06 +0200
Subject: Major Contact Picture code cleanup

Notifications now have pseudotransparent icons, icons are generated in
the correct size.
---
 src/eu/siacs/conversations/ui/ContactsActivity.java     | 2 +-
 src/eu/siacs/conversations/ui/ConversationActivity.java | 2 +-
 src/eu/siacs/conversations/ui/ConversationFragment.java | 6 +++---
 src/eu/siacs/conversations/ui/MucDetailsActivity.java   | 2 +-
 src/eu/siacs/conversations/ui/ShareWithActivity.java    | 5 +++--
 5 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/eu/siacs/conversations/ui')

diff --git a/src/eu/siacs/conversations/ui/ContactsActivity.java b/src/eu/siacs/conversations/ui/ContactsActivity.java
index 835e0a615..e403450a0 100644
--- a/src/eu/siacs/conversations/ui/ContactsActivity.java
+++ b/src/eu/siacs/conversations/ui/ContactsActivity.java
@@ -381,7 +381,7 @@ public class ContactsActivity extends XmppActivity {
 				contactJid.setText(contact.getJid());
 				ImageView imageView = (ImageView) view
 						.findViewById(R.id.contact_photo);
-				imageView.setImageBitmap(UIHelper.getContactPicture(contact, 90, this.getContext()));
+				imageView.setImageBitmap(UIHelper.getContactPicture(contact, 48, this.getContext(), false));
 				return view;
 			}
 		};
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 20d839614..6ce31302e 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -164,7 +164,7 @@ public class ConversationActivity extends XmppActivity {
 				ImageView imageView = (ImageView) view
 						.findViewById(R.id.conversation_image);
 				imageView.setImageBitmap(UIHelper.getContactPicture(
-						conv, 200, activity.getApplicationContext()));
+						conv, 56, activity.getApplicationContext(), false));
 				return view;
 			}
 
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 3796f83e1..61843b820 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -333,7 +333,7 @@ public class ConversationFragment extends Fragment {
 		boolean showPhoneSelfContactPicture = sharedPref.getBoolean(
 				"show_phone_selfcontact_picture", true);
 
-		return UIHelper.getSelfContactPicture(conversation.getAccount(), 200,
+		return UIHelper.getSelfContactPicture(conversation.getAccount(), 48,
 				showPhoneSelfContactPicture, getActivity());
 	}
 
@@ -616,9 +616,9 @@ public class ConversationFragment extends Fragment {
 			} else {
 				Bitmap bm;
 				if (contact != null){
-					bm = UIHelper.getContactPicture(contact, 200, context);
+					bm = UIHelper.getContactPicture(contact, 48, context, false);
 				} else {
-					bm = UIHelper.getContactPicture(name, 200, context);
+					bm = UIHelper.getContactPicture(name, 48, context, false);
 				}
 				bitmaps.put(name, bm);
 				return bm;
diff --git a/src/eu/siacs/conversations/ui/MucDetailsActivity.java b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
index 02bc8ddb6..c6807c612 100644
--- a/src/eu/siacs/conversations/ui/MucDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
@@ -179,7 +179,7 @@ public class MucDetailsActivity extends XmppActivity {
 					role.setText(getReadableRole(contact.getRole()));
 					ImageView imageView = (ImageView) view
 							.findViewById(R.id.contact_photo);
-					imageView.setImageBitmap(UIHelper.getContactPicture(contact.getName(), 90,this.getApplicationContext()));
+					imageView.setImageBitmap(UIHelper.getContactPicture(contact.getName(), 48,this.getApplicationContext(), false));
 					membersView.addView(view);
 				}
 			}
diff --git a/src/eu/siacs/conversations/ui/ShareWithActivity.java b/src/eu/siacs/conversations/ui/ShareWithActivity.java
index 3a6304854..1bc9fc460 100644
--- a/src/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -83,7 +83,8 @@ public class ShareWithActivity extends XmppActivity {
 		for(final Conversation conversation : convList) {
 			View view = createContactView(conversation.getName(useSubject),
 					conversation.getLatestMessage().getBody().trim(),
-					UIHelper.getContactPicture(conversation, 90,this.getApplicationContext()));
+					UIHelper.getContactPicture(conversation, 48,
+						this.getApplicationContext(), false));
 			view.setOnClickListener(new OnClickListener() {
 				
 				@Override
@@ -118,7 +119,7 @@ public class ShareWithActivity extends XmppActivity {
 		for(int i = 0; i < contactsList.size(); ++i) {
 			final Contact con = contactsList.get(i);
 			View view = createContactView(con.getDisplayName(), con.getJid(), 
-					UIHelper.getContactPicture(con, 90, this.getApplicationContext()));
+					UIHelper.getContactPicture(con, 48, this.getApplicationContext(), false));
 			view.setOnClickListener(new OnClickListener() {
 				
 				@Override
-- 
cgit v1.2.3