From 79ab1214e71beec97a8e7894f9bcd0553fc1b02b Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 20 Aug 2015 07:35:01 -0700
Subject: [PATCH] replace send button with menuitem, and add icons for it and
 clear

---
 xwords4/android/XWords4/res/layout/chat.xml   | 19 ++-----
 .../android/XWords4/res/menu/chat_menu.xml    |  7 +++
 .../org/eehouse/android/xw4/ChatDelegate.java | 51 +++++++++----------
 3 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/chat.xml b/xwords4/android/XWords4/res/layout/chat.xml
index 2ac2bff36..422ccfcd7 100644
--- a/xwords4/android/XWords4/res/layout/chat.xml
+++ b/xwords4/android/XWords4/res/layout/chat.xml
@@ -22,24 +22,11 @@
                   />
   </ScrollView>
 
-  <LinearLayout android:orientation="horizontal"
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content"
-                >
-
-    <EditText android:id="@+id/chat_edit" 
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:singleLine="false"
-              android:layout_weight="1"
-              />
-
-    <Button android:id="@+id/send_button"
-            android:layout_width="wrap_content" 
+  <EditText android:id="@+id/chat_edit" 
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/chat_send" 
+            android:singleLine="false"
             android:layout_weight="0"
             />
 
-  </LinearLayout>
 </LinearLayout>
diff --git a/xwords4/android/XWords4/res/menu/chat_menu.xml b/xwords4/android/XWords4/res/menu/chat_menu.xml
index 9ce17dcd1..3dda1c98f 100644
--- a/xwords4/android/XWords4/res/menu/chat_menu.xml
+++ b/xwords4/android/XWords4/res/menu/chat_menu.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/chat_menu_send"
+          android:title="@string/chat_send"
+          android:showAsAction="ifRoom"
+          android:icon="@drawable/send__gen"
+          />
     <item android:id="@+id/chat_menu_clear"
           android:title="@string/chat_menu_clear"
+          android:showAsAction="ifRoom"
+          android:icon="@drawable/content_discard__gen"
           />
 </menu>
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
index fa834906e..b4bdd2b6d 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/ChatDelegate.java
@@ -24,10 +24,8 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
@@ -35,8 +33,7 @@ import android.widget.TextView;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
-public class ChatDelegate extends DelegateBase
-    implements View.OnClickListener {
+public class ChatDelegate extends DelegateBase {
 
     private long m_rowid;
     private Activity m_activity;
@@ -76,9 +73,6 @@ public class ChatDelegate extends DelegateBase
                     }
                 });
 
-            ((Button)findViewById( R.id.send_button ))
-                .setOnClickListener( this );
-
             String title = getString( R.string.chat_title_fmt, 
                                       GameUtils.getName( m_activity, m_rowid ) );
             setTitle( title );
@@ -91,29 +85,34 @@ public class ChatDelegate extends DelegateBase
     @Override
     public boolean onOptionsItemSelected( MenuItem item ) 
     {
-        boolean handled = R.id.chat_menu_clear == item.getItemId();
-        if ( handled ) {
-            showConfirmThen( R.string.confirm_clear_chat, Action.CLEAR_ACTION );
+        boolean handled = true;
+        switch ( item.getItemId() ) {
+        case R.id.chat_menu_clear:
+            if ( handled ) {
+                showConfirmThen( R.string.confirm_clear_chat, Action.CLEAR_ACTION );
+            }
+            break;
+        case R.id.chat_menu_send:
+            EditText edit = (EditText)findViewById( R.id.chat_edit );
+            String text = edit.getText().toString();
+            if ( null == text || text.length() == 0 ) {
+                setResult( Activity.RESULT_CANCELED );
+            } else {
+                DBUtils.appendChatHistory( m_activity, m_rowid, text, true );
+
+                Intent result = new Intent();
+                result.putExtra( BoardDelegate.INTENT_KEY_CHAT, text );
+                setResult( Activity.RESULT_OK, result );
+            }
+            finish();
+            break;
+        default:
+            handled = false;
+            break;
         }
         return handled;
     }
 
-    public void onClick( View view ) 
-    {
-        EditText edit = (EditText)findViewById( R.id.chat_edit );
-        String text = edit.getText().toString();
-        if ( null == text || text.length() == 0 ) {
-            setResult( Activity.RESULT_CANCELED );
-        } else {
-            DBUtils.appendChatHistory( m_activity, m_rowid, text, true );
-
-            Intent result = new Intent();
-            result.putExtra( BoardDelegate.INTENT_KEY_CHAT, text );
-            setResult( Activity.RESULT_OK, result );
-        }
-        finish();
-    }
-
     @Override
     public void dlgButtonClicked( Action action, int which, Object[] params )
     {