Add floating button to switch language.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 33e346668e53d6586ce49f2abae861b1e16ae34d..356e957ebaf8788645e898a1ac3d6b801ba04e7b 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -367,6 +367,7 @@ public class DictionaryActivity extends ActionBarActivity {
         }
         Log.d(LOG, "Loading index " + indexIndex);
         index = dictionary.indices.get(indexIndex);
+        getListView().setEmptyView(findViewById(android.R.id.empty));
         setListAdapter(new IndexAdapter(index));
 
         // Pre-load the collators.
@@ -448,6 +449,21 @@ 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) {
+                onLanguageButtonLongClick(v.getContext());
+                return true;
+            }
+        });
+
         // Set the search text from the intent, then the saved state.
         String text = getIntent().getStringExtra(C.SEARCH_TOKEN);
         if (savedInstanceState != null) {
@@ -473,9 +489,9 @@ public class DictionaryActivity extends ActionBarActivity {
         actionBar.setDisplayShowTitleEnabled(false);
         actionBar.setDisplayShowHomeEnabled(false);
         actionBar.setDisplayHomeAsUpEnabled(false);
-        
+
         final LinearLayout customSearchView = new LinearLayout(getSupportActionBar().getThemedContext());
-        
+
         final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         customSearchView.setLayoutParams(layoutParams);
@@ -507,9 +523,12 @@ public class DictionaryActivity extends ActionBarActivity {
         customSearchView.addView(languageButton, lpb);
 
         searchView = new SearchView(getSupportActionBar().getThemedContext());
-        searchView.setIconifiedByDefault(false);
-        // searchView.setIconified(false); // puts the magnifying glass in the
-        // wrong place.
+
+        // Get rid of search icon, it takes up too much space.
+        // There is still text saying "search" in the search field.
+        searchView.setIconifiedByDefault(true);
+        searchView.setIconified(false);
+
         searchView.setQueryHint(getString(R.string.searchText));
         searchView.setSubmitButtonEnabled(false);
         searchView.setInputType(InputType.TYPE_CLASS_TEXT);
@@ -1144,10 +1163,6 @@ public class DictionaryActivity extends ActionBarActivity {
         moveCursorToRight();
         searchView.setOnQueryTextListener(onQueryTextListener);
 
-        // Hide search icon once text is entered
-        searchView.setIconifiedByDefault(text.length() > 0);
-        searchView.setIconified(false);
-
         if (triggerSearch) {
             onSearchTextChange(text);
         }
@@ -1460,7 +1475,7 @@ public class DictionaryActivity extends ActionBarActivity {
             result.setFocusable(true);
             result.setLongClickable(true);
 //            result.setBackgroundResource(android.R.drawable.menuitem_background);
-            
+
             result.setBackgroundResource(theme.normalRowBg);
 
             result.setOnClickListener(new TextView.OnClickListener() {
@@ -1631,10 +1646,6 @@ public class DictionaryActivity extends ActionBarActivity {
             return;
         }
 
-        // Hide search icon once text is entered
-        searchView.setIconifiedByDefault(text.length() > 0);
-        searchView.setIconified(false);
-
         // if (!searchView.hasFocus()) {
         // Log.d(LOG, "searchText changed without focus, doing nothing.");
         // return;