]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryActivity.java
Add TTS.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java
index cdfe6f979a6d182aae1a34bd563c11af48d8cb19..1516ce4d5e69f626e18579de6d2ada76bc4867ed 100644 (file)
@@ -24,6 +24,8 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.speech.tts.TextToSpeech;
+import android.speech.tts.TextToSpeech.OnInitListener;
 import android.text.ClipboardManager;
 import android.text.Editable;
 import android.text.Selection;
@@ -84,8 +86,10 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.Executor;
@@ -117,6 +121,9 @@ public class DictionaryActivity extends ListActivity {
 
     // package for test.
     final Handler uiHandler = new Handler();
+    
+    TextToSpeech textToSpeech;
+    volatile boolean ttsReady;
 
     private final Executor searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
         @Override
@@ -201,6 +208,15 @@ public class DictionaryActivity extends ListActivity {
 
         final Intent intent = getIntent();
         dictFile = new File(intent.getStringExtra(C.DICT_FILE));
+        
+        ttsReady = false;
+        textToSpeech = new TextToSpeech(getApplicationContext(), new OnInitListener() {
+            @Override
+            public void onInit(int status) {
+                ttsReady = true;
+                updateTTSLanuage();
+            }
+        });
 
         try {
             final String name = application.getDictionaryName(dictFile.getName());
@@ -386,6 +402,7 @@ public class DictionaryActivity extends ListActivity {
 
     @Override
     protected void onResume() {
+        Log.d(LOG, "onResume");
         super.onResume();
         if (PreferenceActivity.prefsMightHaveChanged) {
             PreferenceActivity.prefsMightHaveChanged = false;
@@ -395,6 +412,7 @@ public class DictionaryActivity extends ListActivity {
         if (initialSearchText != null) {
             setSearchText(initialSearchText, true);
         }
+        showKeyboard();
     }
 
     @Override
@@ -444,6 +462,10 @@ public class DictionaryActivity extends ListActivity {
 
     private void onClearSearchTextButton() {
         setSearchText("", true);
+        showKeyboard();
+    }
+
+    private void showKeyboard() {
         Log.d(LOG, "Trying to show soft keyboard.");
         final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
         manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);
@@ -459,6 +481,19 @@ public class DictionaryActivity extends ListActivity {
         // langButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
         langButton.setText(index.shortName);
         // }
+        updateTTSLanuage();
+    }
+    
+    private void updateTTSLanuage() {
+        if (!ttsReady) {
+            return;
+        }
+        final Locale locale = new Locale(index.sortLanguage.getIsoCode());
+        Log.d(LOG, "Setting TTS locale to: " + locale);
+        final int ttsResult = textToSpeech.setLanguage(locale);
+        if (ttsResult != TextToSpeech.SUCCESS) {
+            Log.e(LOG, "TTS not available in this language.");
+        }
     }
 
     void onLanguageButton() {
@@ -504,14 +539,19 @@ public class DictionaryActivity extends ListActivity {
         listView.setAdapter(new BaseAdapter() {
             @Override
             public View getView(int position, View convertView, ViewGroup parent) {
-                final LinearLayout result = new LinearLayout(parent.getContext());
-
                 final DictionaryInfo dictionaryInfo = getItem(position);
+
+                final LinearLayout result = new LinearLayout(parent.getContext());
+                
                 for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
+                    if (i > 0) {
+                        final TextView dash = new TextView(parent.getContext());
+                        dash.setText("-");
+                        result.addView(dash);
+                    }
+                    
                     final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
                     final Button button = new Button(parent.getContext());
-//                    final String name = application
-//                            .getDictionaryName(dictionaryInfo.uncompressedFilename);
                     button.setText(indexInfo.shortName);
                     final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
                             getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename),
@@ -523,19 +563,21 @@ public class DictionaryActivity extends ListActivity {
                         };
                     };
                     button.setOnClickListener(intentLauncher);
-                    final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
-                            ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-                    layoutParams.width = 0;
-                    layoutParams.weight = 1.0f;
-                    button.setLayoutParams(layoutParams);
                     result.addView(button);
                     
-                    if (i > 0) {
-                        final TextView dash = new TextView(parent.getContext());
-                        dash.setText("-");
-                        result.addView(dash);
-                    }
                 }
+                
+                final TextView nameView = new TextView(parent.getContext());
+                final String name = application
+                        .getDictionaryName(dictionaryInfo.uncompressedFilename);
+                nameView.setText(name);
+                final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+                layoutParams.width = 0;
+                layoutParams.weight = 1.0f;
+                nameView.setLayoutParams(layoutParams);
+                result.addView(nameView);
+
                 return result;
             }
 
@@ -746,11 +788,8 @@ public class DictionaryActivity extends ListActivity {
                         indexToUse = selectedSpannableIndex;
                     }
                     final boolean changeIndex = indexIndex != indexToUse;
-                    setSearchText(selectedText, !changeIndex); // If we're not
-                                                               // changing
-                                                               // index, we have
-                                                               // to
-                                                               // triggerSearch.
+                    // If we're not changing index, we have to trigger search:
+                    setSearchText(selectedText, !changeIndex); 
                     if (changeIndex) {
                         changeIndexGetFocusAndResearch(indexToUse);
                     }
@@ -760,6 +799,17 @@ public class DictionaryActivity extends ListActivity {
                 }
             });
         }
+        
+        if (row instanceof TokenRow) {
+            final MenuItem speak = menu.add(R.string.speak);
+            speak.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+                @Override
+                public boolean onMenuItemClick(MenuItem item) {
+                    textToSpeech.speak(((TokenRow) row).getToken(), TextToSpeech.QUEUE_FLUSH, new HashMap<String, String>());
+                    return false;
+                }
+            });
+        }
 
     }
 
@@ -1161,73 +1211,46 @@ public class DictionaryActivity extends ListActivity {
             return result;
         }
 
-        private TableLayout getView(HtmlEntry.Row row, ViewGroup parent, final TableLayout result) {
-            final Context context = parent.getContext();
-
-            final HtmlEntry htmlEntry = row.getEntry();
-
-            // final TableRow tableRow = new TableRow(context);
-            final LinearLayout tableRow = new LinearLayout(context);
-            result.addView(tableRow);
-
-            // Text.
-            final TextView textView = new TextView(context);
-            textView.setText(htmlEntry.title);
-            textView.setLayoutParams(new LinearLayout.LayoutParams(0,
-                    ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f));
-            tableRow.addView(textView);
-
-            // Button.
-            final Button button = new Button(context);
-            button.setText("open");
-            button.setLayoutParams(new LinearLayout.LayoutParams(
-                    ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 0.0f));
-            tableRow.addView(button);
-
-            button.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    startActivity(HtmlDisplayActivity.getHtmlIntent(String.format(
-                            "<html><head></head><body>%s</body></html>", htmlEntry.html)));
-                }
-            });
-
-            return result;
-        }
-
-        private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {
+        private TableLayout getPossibleLinkToHtmlEntryView(final boolean isTokenRow, final String text, final boolean hasMainEntry, final List<HtmlEntry> htmlEntries, final String htmlTextToHighlight, ViewGroup parent, final TableLayout result) {
             final Context context = parent.getContext();
             
             final TableRow tableRow = new TableRow(result.getContext());
-            tableRow.setBackgroundResource(row.hasMainEntry ? theme.tokenRowMainBg
+            tableRow.setBackgroundResource(hasMainEntry ? theme.tokenRowMainBg
                     : theme.tokenRowOtherBg);
-            tableRow.setPadding(mPaddingDefault, mPaddingDefault, mPaddingDefault, 0);
+            if (isTokenRow) {
+                tableRow.setPadding(mPaddingDefault, mPaddingDefault, mPaddingDefault, 0);
+            } else {
+                tableRow.setPadding(mPaddingLarge, mPaddingDefault, mPaddingDefault, 0);
+            }
             result.addView(tableRow);
-            
-            final IndexEntry indexEntry = row.getIndexEntry();
 
             final TextView textView = new TextView(context);
-            textView.setText(indexEntry.token);
+            textView.setText(text);
             // Doesn't work:
             // textView.setTextColor(android.R.color.secondary_text_light);
-            textView.setTextAppearance(context, theme.tokenRowFg);
             textView.setTypeface(typeface);
-            textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 5 * fontSizeSp / 4);
             TableRow.LayoutParams lp = new TableRow.LayoutParams(0);
+            if (isTokenRow) {
+                textView.setTextAppearance(context, theme.tokenRowFg);
+                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 4 * fontSizeSp / 3);
+            } else {
+                textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+            }
             lp.weight = 1.0f;
+            
             textView.setLayoutParams(lp);
             tableRow.addView(textView);
 
             
-            if (!indexEntry.htmlEntries.isEmpty()) {
+            if (!htmlEntries.isEmpty()) {
                 final ImageButton button = new ImageButton(context);
                 button.setImageResource(R.drawable.ic_menu_forward);
                 button.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        final String html = HtmlEntry.htmlBody(indexEntry.htmlEntries);
+                        final String html = HtmlEntry.htmlBody(htmlEntries);
                         startActivity(HtmlDisplayActivity.getHtmlIntent(String.format(
-                                "<html><head></head><body>%s</body></html>", html)));
+                                "<html><head></head><body>%s</body></html>", html), htmlTextToHighlight, false));
                     }
                 });
                 tableRow.addView(button);
@@ -1237,12 +1260,26 @@ public class DictionaryActivity extends ListActivity {
                 //result.setColumnStretchable(0, true);
                 //result.setColumnStretchable(1, false);
             }
-            
-            
+            result.setLongClickable(true);
             return result;
         }
+        
+        private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {
+            final IndexEntry indexEntry = row.getIndexEntry();
+            return getPossibleLinkToHtmlEntryView(true, indexEntry.token, row.hasMainEntry, indexEntry.htmlEntries, null, parent, result);
+        }
+        
+        private TableLayout getView(HtmlEntry.Row row, ViewGroup parent, final TableLayout result) {
+            final HtmlEntry htmlEntry = row.getEntry();
+            final TokenRow tokenRow = row.getTokenRow(true);
+            return getPossibleLinkToHtmlEntryView(false, getString(R.string.seeAlso, htmlEntry.title, htmlEntry.entrySource.getName()), 
+                    false, Collections.singletonList(htmlEntry), tokenRow.getToken(), parent, result);
+        }
+
 
     }
+    
+
 
     static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}\\p{M}\\p{N}]+");
 
@@ -1357,15 +1394,15 @@ public class DictionaryActivity extends ListActivity {
     }
 
     void setFiltered(final SearchOperation searchOperation) {
-        ((Button) findViewById(R.id.UpButton)).setEnabled(false);
-        ((Button) findViewById(R.id.DownButton)).setEnabled(false);
+        ((ImageButton) findViewById(R.id.UpButton)).setEnabled(false);
+        ((ImageButton) findViewById(R.id.DownButton)).setEnabled(false);
         rowsToShow = searchOperation.multiWordSearchResult;
         setListAdapter(new IndexAdapter(index, rowsToShow, searchOperation.searchTokens));
     }
 
     void clearFiltered() {
-        ((Button) findViewById(R.id.UpButton)).setEnabled(true);
-        ((Button) findViewById(R.id.DownButton)).setEnabled(true);
+        ((ImageButton) findViewById(R.id.UpButton)).setEnabled(true);
+        ((ImageButton) findViewById(R.id.DownButton)).setEnabled(true);
         setListAdapter(new IndexAdapter(index));
         rowsToShow = null;
     }