Fix trailing whitespace and DOS linebreaks.

[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 140de67c2a83bafe8e413871ee9db930242ea4b1..c79faf32c77e4384867e54a8745839b5e8f28c4b 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -35,6 +35,7 @@ import android.support.v7.widget.SearchView;
 import android.support.v7.widget.SearchView.OnQueryTextListener;
 import android.support.v7.widget.Toolbar;
 import android.text.ClipboardManager;
+import android.text.InputType;
 import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
@@ -328,7 +329,7 @@ public class DictionaryActivity extends ActionBarActivity {
             @Override
             public void onInit(int status) {
                 ttsReady = true;
-                updateTTSLanguage();
+                updateTTSLanguage(indexIndex);
             }
         });
 
@@ -472,9 +473,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);
@@ -506,11 +507,15 @@ 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);
         searchView.setImeOptions(
                 EditorInfo.IME_ACTION_DONE |
                         EditorInfo.IME_FLAG_NO_EXTRACT_UI |
@@ -656,21 +661,25 @@ public class DictionaryActivity extends ActionBarActivity {
                 languageButton.setImageResource(android.R.drawable.ic_media_previous);
             }
         }
-        updateTTSLanguage();
+        updateTTSLanguage(indexIndex);
     }
 
-    private void updateTTSLanguage() {
+    private void updateTTSLanguage(int i) {
         if (!ttsReady || index == null || textToSpeech == null) {
             Log.d(LOG, "Can't updateTTSLanguage.");
             return;
         }
-        final Locale locale = new Locale(index.sortLanguage.getIsoCode());
+        final Locale locale = new Locale(dictionary.indices.get(i).sortLanguage.getIsoCode());
         Log.d(LOG, "Setting TTS locale to: " + locale);
+        try {
         final int ttsResult = textToSpeech.setLanguage(locale);
         if (ttsResult != TextToSpeech.LANG_AVAILABLE &&
                 ttsResult != TextToSpeech.LANG_COUNTRY_AVAILABLE) {
             Log.e(LOG, "TTS not available in this language: ttsResult=" + ttsResult);
         }
+        } catch (Exception e) {
+            Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
+        }
     }
 
     void onLanguageButtonClick() {
@@ -683,7 +692,7 @@ public class DictionaryActivity extends ActionBarActivity {
             currentSearchOperation = null;
         }
         setIndexAndSearchText((indexIndex + 1) % dictionary.indices.size(),
-                searchView.getQuery().toString());
+                searchView.getQuery().toString(), false);
     }
 
     void onLanguageButtonLongClick(final Context context) {
@@ -730,6 +739,10 @@ public class DictionaryActivity extends ActionBarActivity {
                         }
                     };
                     button.setOnClickListener(intentLauncher);
+                    if (i == indexIndex && dictFile != null &&
+                        dictFile.getName().equals(dictionaryInfo.uncompressedFilename)) {
+                        button.setPressed(true);
+                    }
                     result.addView(button);
                 }
 
@@ -971,12 +984,14 @@ public class DictionaryActivity extends ActionBarActivity {
             //searchForSelection.setIcon(R.drawable.abs__ic_search);
         }
 
-        if (row instanceof TokenRow && ttsReady) {
+        if ((row instanceof TokenRow || selectedSpannableText != null) && ttsReady) {
             final android.view.MenuItem speak = menu.add(R.string.speak);
+            final String textToSpeak = row instanceof TokenRow ? ((TokenRow) row).getToken() : selectedSpannableText;
+            updateTTSLanguage(row instanceof TokenRow ? indexIndex : selectedSpannableIndex);
             speak.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
                 @Override
                 public boolean onMenuItemClick(android.view.MenuItem item) {
-                    textToSpeech.speak(((TokenRow) row).getToken(), TextToSpeech.QUEUE_FLUSH,
+                    textToSpeech.speak(textToSpeak, TextToSpeech.QUEUE_FLUSH,
                             new HashMap<String, String>());
                     return false;
                 }
@@ -987,6 +1002,7 @@ public class DictionaryActivity extends ActionBarActivity {
     private void jumpToTextFromHyperLink(
             final String selectedText, final int defaultIndexToUse) {
         int indexToUse = -1;
+        int numFound = 0;
         for (int i = 0; i < dictionary.indices.size(); ++i) {
             final Index index = dictionary.indices.get(i);
             if (indexPrepFinished) {
@@ -997,14 +1013,14 @@ public class DictionaryActivity extends ActionBarActivity {
                             .getTokenRow(false);
                     if (tokenRow != null && tokenRow.hasMainEntry) {
                         indexToUse = i;
-                        break;
+                        ++numFound;
                     }
                 }
             } else {
                 Log.w(LOG, "Skipping findExact on index " + index.shortName);
             }
         }
-        if (indexToUse == -1) {
+        if (numFound != 1 || indexToUse == -1) {
             indexToUse = defaultIndexToUse;
         }
         // Without this extra delay, the call to jumpToRow that this
@@ -1013,7 +1029,7 @@ public class DictionaryActivity extends ActionBarActivity {
         getListView().postDelayed(new Runnable() {
             @Override
             public void run() {
-                setIndexAndSearchText(actualIndexToUse, selectedText);
+                setIndexAndSearchText(actualIndexToUse, selectedText, true);
             }
         }, 100);
     }
@@ -1105,7 +1121,7 @@ public class DictionaryActivity extends ActionBarActivity {
         return super.onKeyDown(keyCode, event);
     }
 
-    private void setIndexAndSearchText(int newIndex, String newSearchText) {
+    private void setIndexAndSearchText(int newIndex, String newSearchText, boolean hideKeyboard) {
         Log.d(LOG, "Changing index to: " + newIndex);
         if (newIndex == -1) {
             Log.e(LOG, "Invalid index.");
@@ -1120,10 +1136,10 @@ public class DictionaryActivity extends ActionBarActivity {
             setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
             updateLangButton();
         }
-        setSearchText(newSearchText, true);
+        setSearchText(newSearchText, true, hideKeyboard);
     }
 
-    private void setSearchText(final String text, final boolean triggerSearch) {
+    private void setSearchText(final String text, final boolean triggerSearch, boolean hideKeyboard) {
         Log.d(LOG, "setSearchText, text=" + text + ", triggerSearch=" + triggerSearch);
         // Disable the listener, because sometimes it doesn't work.
         searchView.setOnQueryTextListener(null);
@@ -1131,18 +1147,20 @@ 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);
+        }
 
         // We don't want to show virtual keyboard when we're changing searchView text programatically:
-        hideKeyboard();
-
-        if (triggerSearch) {
-            onQueryTextListener.onQueryTextChange(text);
+        if (hideKeyboard) {
+            hideKeyboard();
         }
     }
 
+    private void setSearchText(final String text, final boolean triggerSearch) {
+       setSearchText(text, triggerSearch, true);
+    }
+
     // private long cursorDelayMillis = 100;
     private void moveCursorToRight() {
         // if (searchText.getLayout() != null) {
@@ -1441,7 +1459,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() {
@@ -1473,9 +1491,7 @@ public class DictionaryActivity extends ActionBarActivity {
             final TextView textView = new TextView(context);
             textView.setText(text, BufferType.SPANNABLE);
             createTokenLinkSpans(textView, (Spannable) textView.getText(), text);
-            final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
-                    0);
-            textView.setOnLongClickListener(textViewLongClickListenerIndex0);
+            textView.setOnLongClickListener(indexIndex > 0 ? textViewLongClickListenerIndex1 : textViewLongClickListenerIndex0);
             result.setLongClickable(true);
 
             // Doesn't work:
@@ -1614,10 +1630,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;