Prefer XML click handling setup.

diff --git a/res/layout/dictionary_activity.xml b/res/layout/dictionary_activity.xml
index e758e8d90f23d32909e8146e201d4e348a6bbfd9..3e381371e68176e0a98681b7c22fb2fc313cad0f 100644 (file)
--- a/res/layout/dictionary_activity.xml
+++ b/res/layout/dictionary_activity.xml
@@ -60,6 +60,7 @@
         android:layout_alignParentRight="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:onClick="onLanguageButtonClick"
         android:src="@drawable/ic_swap_horiz_black_24dp" />
 
      <android.support.design.widget.FloatingActionButton
@@ -70,6 +71,7 @@
         android:layout_alignParentBottom="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:onClick="onSearchButtonClick"
         android:src="@drawable/ic_search_black_24dp" />
 
     <TextView

diff --git a/res/layout/html_display_activity.xml b/res/layout/html_display_activity.xml
index a47c7d4ab3b7a2c17d665b8e661f8164ab7909ae..50105fb792bd8cbf5cf3856e750fa93d1e5fcf27 100644 (file)
--- a/res/layout/html_display_activity.xml
+++ b/res/layout/html_display_activity.xml
@@ -14,6 +14,7 @@
       android:id="@+id/okButton"
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
+      android:onClick="onOkClick"
       android:text="@android:string/ok" />
 
 </LinearLayout>

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 683ff5094ec48d953ee12d7eedb1f116ca6247bd..0a301eaf7d32598b98668458b3ea309401356467 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -503,12 +503,6 @@ public class DictionaryActivity extends ActionBarActivity {
         onCreateSetupActionBarAndSearchView();
 
         View floatSwapButton = findViewById(R.id.floatSwapButton);
-        floatSwapButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View arg0) {
-                onLanguageButtonClick();
-            }
-        });
         floatSwapButton.setOnLongClickListener(new OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
@@ -517,21 +511,6 @@ public class DictionaryActivity extends ActionBarActivity {
             }
         });
 
-        final FloatingActionButton floatSearchButton = (FloatingActionButton)findViewById(R.id.floatSearchButton);
-        floatSearchButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View arg0) {
-                if (!searchView.hasFocus()) {
-                    searchView.requestFocus();
-                }
-                if (searchView.getQuery().toString().length() > 0) {
-                    searchView.setQuery("", false);
-                }
-                showKeyboard();
-                searchView.setIconified(false);
-            }
-        });
-
         // Set the search text from the intent, then the saved state.
         String text = getIntent().getStringExtra(C.SEARCH_TOKEN);
         if (savedInstanceState != null) {
@@ -762,7 +741,18 @@ public class DictionaryActivity extends ActionBarActivity {
         }
     }
 
-    void onLanguageButtonClick() {
+    public void onSearchButtonClick(View dummy) {
+        if (!searchView.hasFocus()) {
+            searchView.requestFocus();
+        }
+        if (searchView.getQuery().toString().length() > 0) {
+            searchView.setQuery("", false);
+        }
+        showKeyboard();
+        searchView.setIconified(false);
+    }
+
+    public void onLanguageButtonClick(View dummy) {
         if (dictionary.indices.size() == 1) {
             // No need to work to switch indices.
             return;

diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index c64b4b5b668a1c84ebb96230d69ff710bd89fbe4..c4460f0cd77f88414f5917744bf726ce54a0875f 100644 (file)
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -62,6 +62,10 @@ public final class HtmlDisplayActivity extends ActionBarActivity {
         return intent;
     }
 
+    public void onOkClick(View dummy) {
+        finish();
+    }
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(final Bundle savedInstanceState) {
@@ -105,12 +109,6 @@ public final class HtmlDisplayActivity extends ActionBarActivity {
         }
 
         final Button okButton = (Button) findViewById(R.id.okButton);
-        okButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
         if (!getIntent().getBooleanExtra(SHOW_OK_BUTTON, true)) {
             okButton.setVisibility(Button.GONE);
         }