BEEM: comparison src/com/beem/project/beem/ui/Chat.java

equal deleted inserted replaced

-:c2eb19cd7032
+:0de5ddd06ecd
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
 import android.text.util.Linkify;
 import android.util.Log;
+import android.view.inputmethod.EditorInfo;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import com.beem.project.beem.R;
+import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.providers.AvatarProvider;
 import com.beem.project.beem.service.Contact;
 import com.beem.project.beem.service.Message;
 import com.beem.project.beem.service.PresenceAdapter;
 import com.beem.project.beem.service.aidl.IBeemRosterListener;
 /**
 * This class represents an activity which allows the user to chat with his/her contacts.
 * @author Jean-Manuel Da Silva <dasilvj at beem-project dot com>
 */
-public class Chat extends Activity implements OnKeyListener {
+public class Chat extends Activity implements TextView.OnEditorActionListener {
 private static final String TAG = "Chat";
 private static final Intent SERVICE_INTENT = new Intent();
 static {
 	SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService"));
 @Override
 protected void onCreate(Bundle savedBundle) {
 	super.onCreate(savedBundle);
 	this.registerReceiver(mBroadcastReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED));
 	SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
-	mCompact = settings.getBoolean("settings_chat_compact_key", false);
+	mCompact = settings.getBoolean(BeemApplication.USE_COMPACT_CHAT_UI_KEY, false);
 	// UI
 	if (!mCompact) {
 	    setContentView(R.layout.chat);
 	    mContactNameTextView = (TextView) findViewById(R.id.chat_contact_name);
 	    mContactStatusMsgTextView = (TextView) findViewById(R.id.chat_contact_status_msg);
 	    setContentView(R.layout.chat_compact);
 	}
 	mMessagesListView = (ListView) findViewById(R.id.chat_messages);
 	mMessagesListView.setAdapter(mMessagesListAdapter);
 	mInputField = (EditText) findViewById(R.id.chat_input);
-	mInputField.setOnKeyListener(this);
+	mInputField.setOnEditorActionListener(this);
 	mInputField.requestFocus();
 	mSendButton = (Button) findViewById(R.id.chat_send_message);
 	mSendButton.setOnClickListener(new OnClickListener() {
 	    @Override
 	    public void onClick(View v) {
 	 * @param message A String containing the message.
 	 * @param isError if the message is an error message.
 	 * @param date the time of the message.
 	 */
 	public MessageText(final String bareJid, final String name, final String message,
-	    final boolean isError, Date date) {
+	    final boolean isError, final Date date) {
 	    mBareJid = bareJid;
 	    mName = name;
 	    mMessage = message;
 	    mIsError = isError;
 	    mTimestamp = date;
 /**
 * {@inheritDoc}.
 */
 @Override
-public boolean onKey(View v, int keyCode, KeyEvent event) {
+public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-	if (event.getAction() == KeyEvent.ACTION_DOWN) {
+	if (v == mInputField && actionId == EditorInfo.IME_ACTION_SEND) {
-	    switch (keyCode) {
+	    sendMessage();
-		case KeyEvent.KEYCODE_ENTER:
+	    return true;
-		    sendMessage();
-		    return true;
-		default:
-		    return false;
-	    }
 	}
 	return false;
 }
 /**

changeset 924	0de5ddd06ecd
parent 921	ab30d289a86c
parent 886	64f37098247c
child 925	5441ea00c4f1