# HG changeset patch
# User nikita@nikita-lab
# Date 1243000444 -7200
# Node ID 99d2dad14716a282883e04ea2a3388f3e8105ed0
# Parent  32104eafe7843cea5998c2f2ed18ab8236f97226# Parent  fc72cf12c7017ffe09e1814b2acc5c5b22a81403
merged

diff -r 32104eafe784 -r 99d2dad14716 res/layout/contactdialog.xml
--- a/res/layout/contactdialog.xml	Fri May 22 15:49:37 2009 +0200
+++ b/res/layout/contactdialog.xml	Fri May 22 15:54:04 2009 +0200
@@ -3,7 +3,19 @@
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 
-	<Button android:id="@+id/chat" android:layout_width="fill_parent"
+	<Button android:id="@+id/CDChat" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:text="Chat" />
 
+	<Button android:id="@+id/CDAlias" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:text="Alias" />
+
+	<Button android:id="@+id/CDGroup" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:text="Change group" />
+
+	<Button android:id="@+id/CDResend" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:text="Resend suscription" />
+
+	<Button android:id="@+id/CDInfos" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:text="User infos" />
+
 </LinearLayout>
\ No newline at end of file
diff -r 32104eafe784 -r 99d2dad14716 src/com/beem/project/beem/ui/ContactDialog.java
--- a/src/com/beem/project/beem/ui/ContactDialog.java	Fri May 22 15:49:37 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactDialog.java	Fri May 22 15:54:04 2009 +0200
@@ -13,7 +13,6 @@
 
 public class ContactDialog extends Dialog {
 
-   // final private CharSequence[] items = { "Chat", "Resend suscription", "Alias", "Change group", "Infos" };
     private Contact mContact;
     private Context mContext;
 
@@ -23,19 +22,70 @@
 	setContentView(R.layout.contactdialog);
 	mContact = curContact;
 	setTitle(curContact.getJID());
-		
-	Button chat = (Button) findViewById(R.id.chat);
-	chat.setOnClickListener(new View.OnClickListener() {
+
+	Button chat = (Button) findViewById(R.id.CDChat);
+	chat.setOnClickListener(new chatListener());
+	Button alias= (Button) findViewById(R.id.CDAlias);
+	alias.setOnClickListener(new chatListener());
+	Button group = (Button) findViewById(R.id.CDGroup);
+	group.setOnClickListener(new chatListener());
+	Button resend = (Button) findViewById(R.id.CDResend);
+	resend.setOnClickListener(new chatListener());
+	Button infos = (Button) findViewById(R.id.CDInfos);
+	infos.setOnClickListener(new chatListener());
+    }
+
+    class chatListener implements View.OnClickListener {
+
+	@Override
+	public void onClick(View v) {
+	    Activity a = ContactDialog.this.getOwnerActivity();
+	    Intent i = new Intent(mContext, SendIM.class);
+	    i.putExtra("contact", mContact);
+	    a.startActivity(i);
+	    dismiss();
+	}
+
+    }
+
+    class aliasListener implements View.OnClickListener {
 
-	    @Override
-	    public void onClick(View v) {
-		Activity a = ContactDialog.this.getOwnerActivity();
-		Intent i = new Intent(mContext, SendIM.class);
-		i.putExtra("contact", mContact);
-		a.startActivity(i);
-		dismiss();
-	    }
-	    
-	});
+	@Override
+	public void onClick(View v) {
+	    // TODO Auto-generated method stub
+	    dismiss();
+	}
+	
+    }
+    
+    class groupListener implements View.OnClickListener {
+
+	@Override
+	public void onClick(View v) {
+	    // TODO Auto-generated method stub
+	    dismiss();
+	}
+	
     }
+    
+    class resendListener implements View.OnClickListener {
+
+	@Override
+	public void onClick(View v) {
+	    // TODO Auto-generated method stub
+	    dismiss();
+	}
+	
+    }
+    
+    class infosListener implements View.OnClickListener {
+
+	@Override
+	public void onClick(View v) {
+	    // TODO Auto-generated method stub
+	    dismiss();
+	}
+	
+    }
+
 }
diff -r 32104eafe784 -r 99d2dad14716 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Fri May 22 15:49:37 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java	Fri May 22 15:54:04 2009 +0200
@@ -226,6 +226,7 @@
 
 	void createDialog(Contact contact) {
 	    Dialog dialogContact= new ContactDialog(ContactList.this, contact);
+	    dialogContact.setOwnerActivity(ContactList.this);
 	    dialogContact.show();
 	}