From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Thu, 27 Oct 2016 22:43:52 +0000 (+0200)
Subject: Also add a search/clear FloatingActionButton.
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=25425d0c98914bc805cc12fb82a978223c451eea

Also add a search/clear FloatingActionButton.
---

diff --git a/res/drawable-hdpi/ic_clear_black_24dp.png b/res/drawable-hdpi/ic_clear_black_24dp.png
new file mode 100644
index 0000000..1a9cd75
Binary files /dev/null and b/res/drawable-hdpi/ic_clear_black_24dp.png differ
diff --git a/res/drawable-hdpi/ic_search_black_24dp.png b/res/drawable-hdpi/ic_search_black_24dp.png
new file mode 100644
index 0000000..c593e7a
Binary files /dev/null and b/res/drawable-hdpi/ic_search_black_24dp.png differ
diff --git a/res/drawable-mdpi/ic_clear_black_24dp.png b/res/drawable-mdpi/ic_clear_black_24dp.png
new file mode 100644
index 0000000..40a1a84
Binary files /dev/null and b/res/drawable-mdpi/ic_clear_black_24dp.png differ
diff --git a/res/drawable-mdpi/ic_search_black_24dp.png b/res/drawable-mdpi/ic_search_black_24dp.png
new file mode 100644
index 0000000..6b16343
Binary files /dev/null and b/res/drawable-mdpi/ic_search_black_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_clear_black_24dp.png b/res/drawable-xhdpi/ic_clear_black_24dp.png
new file mode 100644
index 0000000..6bc4372
Binary files /dev/null and b/res/drawable-xhdpi/ic_clear_black_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_search_black_24dp.png b/res/drawable-xhdpi/ic_search_black_24dp.png
new file mode 100644
index 0000000..6381902
Binary files /dev/null and b/res/drawable-xhdpi/ic_search_black_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_clear_black_24dp.png b/res/drawable-xxhdpi/ic_clear_black_24dp.png
new file mode 100644
index 0000000..51b4401
Binary files /dev/null and b/res/drawable-xxhdpi/ic_clear_black_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_search_black_24dp.png b/res/drawable-xxhdpi/ic_search_black_24dp.png
new file mode 100644
index 0000000..3ae490e
Binary files /dev/null and b/res/drawable-xxhdpi/ic_search_black_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_clear_black_24dp.png b/res/drawable-xxxhdpi/ic_clear_black_24dp.png
new file mode 100644
index 0000000..df42fee
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_clear_black_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_search_black_24dp.png b/res/drawable-xxxhdpi/ic_search_black_24dp.png
new file mode 100644
index 0000000..21be572
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_search_black_24dp.png differ
diff --git a/res/layout/dictionary_activity.xml b/res/layout/dictionary_activity.xml
index e92915d..ca812d1 100644
--- a/res/layout/dictionary_activity.xml
+++ b/res/layout/dictionary_activity.xml
@@ -57,6 +57,14 @@
         android:layout_height="wrap_content"
         android:src="@drawable/ic_swap_horiz_black_24dp" />
 
+     <android.support.design.widget.FloatingActionButton
+        android:id="@+id/floatSearchButton"
+        android:layout_toLeftOf="@+id/floatSwapButton"
+        android:layout_alignParentBottom="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_search_black_24dp" />
+
     <TextView
         android:id="@android:id/empty"
         android:layout_width="match_parent"
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 2bfb8c1..8575fa6 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -28,6 +28,7 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
@@ -473,6 +474,21 @@ 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) {
@@ -1666,6 +1682,7 @@ public class DictionaryActivity extends ActionBarActivity {
         }
         currentSearchOperation = new SearchOperation(text, index);
         searchExecutor.execute(currentSearchOperation);
+        ((FloatingActionButton)findViewById(R.id.floatSearchButton)).setImageResource(text.length() > 0 ? R.drawable.ic_clear_black_24dp : R.drawable.ic_search_black_24dp);
     }
 
     // --------------------------------------------------------------------------