# HG changeset patch
# User nikita@nikita-lab
# Date 1243000246 -7200
# Node ID fc72cf12c7017ffe09e1814b2acc5c5b22a81403
# Parent 73b3c7576722a52e694e86bf6a8c481f82bd458c# Parent 9b43ad1f94e9b29902d3574ad10c332b4834ce21
merged
diff -r 73b3c7576722 -r fc72cf12c701 res/layout/contactdialog.xml
--- a/res/layout/contactdialog.xml Fri May 22 15:07:35 2009 +0200
+++ b/res/layout/contactdialog.xml Fri May 22 15:50:46 2009 +0200
@@ -3,7 +3,19 @@
android:orientation="vertical" android:layout_width="fill_parent"
android:layout_height="fill_parent">
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r 73b3c7576722 -r fc72cf12c701 src/com/beem/project/beem/ui/ContactDialog.java
--- a/src/com/beem/project/beem/ui/ContactDialog.java Fri May 22 15:07:35 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactDialog.java Fri May 22 15:50:46 2009 +0200
@@ -12,7 +12,6 @@
public class ContactDialog extends Dialog {
- // final private CharSequence[] items = { "Chat", "Resend suscription", "Alias", "Change group", "Infos" };
private Contact mContact;
private Context mContext;
@@ -22,19 +21,70 @@
setContentView(R.layout.contactdialog);
mContact = c;
setTitle(c.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 73b3c7576722 -r fc72cf12c701 src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java Fri May 22 15:07:35 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java Fri May 22 15:50:46 2009 +0200
@@ -216,6 +216,7 @@
void createDialog(Contact contact) {
Dialog dialogContact= new ContactDialog(ContactList.this, contact);
+ dialogContact.setOwnerActivity(ContactList.this);
dialogContact.show();
}