]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryActivity.java
Some lint fixes.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java
index e63916c03c64ef6f364e14d72bef68fca3ec0785..02286155532c187bf366a1cf86ffcdec1e034db6 100644 (file)
@@ -29,10 +29,11 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
+import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.SearchView.OnQueryTextListener;
 import android.support.v7.widget.Toolbar;
@@ -76,7 +77,6 @@ import android.widget.ListView;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
-import android.widget.TextView.BufferType;
 import android.widget.Toast;
 
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
@@ -85,7 +85,6 @@ import com.hughes.android.dictionary.engine.EntrySource;
 import com.hughes.android.dictionary.engine.HtmlEntry;
 import com.hughes.android.dictionary.engine.Index;
 import com.hughes.android.dictionary.engine.Index.IndexEntry;
-import com.hughes.android.dictionary.engine.Language.LanguageResources;
 import com.hughes.android.dictionary.engine.PairEntry;
 import com.hughes.android.dictionary.engine.PairEntry.Pair;
 import com.hughes.android.dictionary.engine.RowBase;
@@ -111,7 +110,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -119,44 +117,44 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DictionaryActivity extends ActionBarActivity {
+public class DictionaryActivity extends AppCompatActivity {
 
-    static final String LOG = "QuickDic";
+    private static final String LOG = "QuickDic";
 
-    DictionaryApplication application;
+    private DictionaryApplication application;
 
-    File dictFile = null;
-    FileChannel dictRaf = null;
-    String dictFileTitleName = null;
+    private File dictFile = null;
+    private FileChannel dictRaf = null;
+    private String dictFileTitleName = null;
 
-    Dictionary dictionary = null;
+    private Dictionary dictionary = null;
 
-    int indexIndex = 0;
+    private int indexIndex = 0;
 
-    Index index = null;
+    private Index index = null;
 
-    List<RowBase> rowsToShow = null; // if not null, just show these rows.
+    private List<RowBase> rowsToShow = null; // if not null, just show these rows.
 
-    final Random rand = new Random();
+    private final Random rand = new Random();
 
-    final Handler uiHandler = new Handler();
+    private final Handler uiHandler = new Handler();
 
     private final ExecutorService searchExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
         @Override
-        public Thread newThread(Runnable r) {
+        public Thread newThread(@NonNull Runnable r) {
             return new Thread(r, "searchExecutor");
         }
     });
 
     private SearchOperation currentSearchOperation = null;
 
-    TextToSpeech textToSpeech;
-    volatile boolean ttsReady;
+    private TextToSpeech textToSpeech;
+    private volatile boolean ttsReady;
 
-    Typeface typeface;
-    DictionaryApplication.Theme theme = DictionaryApplication.Theme.LIGHT;
-    int textColorFg = Color.BLACK;
-    int fontSizeSp;
+    private Typeface typeface;
+    private DictionaryApplication.Theme theme = DictionaryApplication.Theme.LIGHT;
+    private int textColorFg = Color.BLACK;
+    private int fontSizeSp;
 
     private ListView listView;
     private ListView getListView() {
@@ -174,11 +172,12 @@ public class DictionaryActivity extends ActionBarActivity {
         return getListView().getAdapter();
     }
 
-    SearchView searchView;
-    ImageButton languageButton;
-    SearchView.OnQueryTextListener onQueryTextListener;
+    private SearchView searchView;
+    private ImageButton languageButton;
+    private SearchView.OnQueryTextListener onQueryTextListener;
 
-    MenuItem nextWordMenuItem, previousWordMenuItem, randomWordMenuItem;
+    private MenuItem nextWordMenuItem;
+    private MenuItem previousWordMenuItem;
 
     // Never null.
     private File wordList = null;
@@ -186,7 +185,7 @@ public class DictionaryActivity extends ActionBarActivity {
     private boolean clickOpensContextMenu = false;
 
     // Visible for testing.
-    ListAdapter indexAdapter = null;
+    private ListAdapter indexAdapter = null;
 
     /**
      * For some languages, loading the transliterators used in this search takes
@@ -230,6 +229,8 @@ public class DictionaryActivity extends ActionBarActivity {
     private void dictionaryOpenFail(Exception e) {
         Log.e(LOG, "Unable to load dictionary.", e);
         if (dictRaf != null) {
+            indexAdapter = null;
+            setListAdapter(null);
             try {
                 dictRaf.close();
             } catch (IOException e1) {
@@ -237,8 +238,9 @@ public class DictionaryActivity extends ActionBarActivity {
             }
             dictRaf = null;
         }
-        Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()),
-                       Toast.LENGTH_LONG).show();
+        if (!isFinishing())
+            Toast.makeText(this, getString(R.string.invalidDictionary, "", e.getMessage()),
+                           Toast.LENGTH_LONG).show();
         startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
         finish();
     }
@@ -276,8 +278,8 @@ public class DictionaryActivity extends ActionBarActivity {
 
         final Intent intent = getIntent();
         String intentAction = intent.getAction();
-        /**
-         * @author Dominik Köppl Querying the Intent
+        /*
+          @author Dominik Köppl Querying the Intent
          *         com.hughes.action.ACTION_SEARCH_DICT is the advanced query
          *         Arguments: SearchManager.QUERY -> the phrase to search from
          *         -> language in which the phrase is written to -> to which
@@ -326,8 +328,8 @@ public class DictionaryActivity extends ActionBarActivity {
 
             }
         }
-        /**
-         * @author Dominik Köppl Querying the Intent Intent.ACTION_SEARCH is a
+        /*
+          @author Dominik Köppl Querying the Intent Intent.ACTION_SEARCH is a
          *         simple query Arguments follow from android standard (see
          *         documentation)
          */
@@ -362,8 +364,8 @@ public class DictionaryActivity extends ActionBarActivity {
                 return;
             }
         }
-        /**
-         * @author Dominik Köppl If no dictionary is chosen, use the default
+        /*
+          @author Dominik Köppl If no dictionary is chosen, use the default
          *         dictionary specified in the preferences If this step does
          *         fail (no default dictionary specified), show a toast and
          *         abort.
@@ -412,12 +414,13 @@ public class DictionaryActivity extends ActionBarActivity {
         }
 
         if (dictFilename == null) {
-            Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show();
+            if (!isFinishing())
+                Toast.makeText(this, getString(R.string.no_dict_file), Toast.LENGTH_LONG).show();
             startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()));
             finish();
             return;
         }
-        if (dictRaf == null && dictFilename != null)
+        if (dictRaf == null)
             dictFile = new File(dictFilename);
 
         ttsReady = false;
@@ -500,25 +503,32 @@ public class DictionaryActivity extends ActionBarActivity {
         }).start();
 
         String fontName = prefs.getString(getString(R.string.fontKey), "FreeSerif.otf.jpg");
-        if ("SYSTEM".equals(fontName)) {
-            typeface = Typeface.DEFAULT;
-        } else if ("SERIF".equals(fontName)) {
-            typeface = Typeface.SERIF;
-        } else if ("SANS_SERIF".equals(fontName)) {
-            typeface = Typeface.SANS_SERIF;
-        } else if ("MONOSPACE".equals(fontName)) {
-            typeface = Typeface.MONOSPACE;
-        } else {
-            if ("FreeSerif.ttf.jpg".equals(fontName)) {
-                fontName = "FreeSerif.otf.jpg";
-            }
-            try {
-                typeface = Typeface.createFromAsset(getAssets(), fontName);
-            } catch (Exception e) {
-                Log.w(LOG, "Exception trying to use typeface, using default.", e);
-                Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()),
-                               Toast.LENGTH_LONG).show();
-            }
+        switch (fontName) {
+            case "SYSTEM":
+                typeface = Typeface.DEFAULT;
+                break;
+            case "SERIF":
+                typeface = Typeface.SERIF;
+                break;
+            case "SANS_SERIF":
+                typeface = Typeface.SANS_SERIF;
+                break;
+            case "MONOSPACE":
+                typeface = Typeface.MONOSPACE;
+                break;
+            default:
+                if ("FreeSerif.ttf.jpg".equals(fontName)) {
+                    fontName = "FreeSerif.otf.jpg";
+                }
+                try {
+                    typeface = Typeface.createFromAsset(getAssets(), fontName);
+                } catch (Exception e) {
+                    Log.w(LOG, "Exception trying to use typeface, using default.", e);
+                    if (!isFinishing())
+                        Toast.makeText(this, getString(R.string.fontFailure, e.getLocalizedMessage()),
+                                Toast.LENGTH_LONG).show();
+                }
+                break;
         }
         if (typeface == null) {
             Log.w(LOG, "Unable to create typeface, using default.");
@@ -660,16 +670,11 @@ public class DictionaryActivity extends ActionBarActivity {
         showKeyboard();
     }
 
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
     /**
      * Invoked when MyWebView returns, since the user might have clicked some
      * hypertext in the MyWebView.
      */
+    @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent result) {
         super.onActivityResult(requestCode, resultCode, result);
         if (result != null && result.hasExtra(C.SEARCH_TOKEN)) {
@@ -710,6 +715,9 @@ public class DictionaryActivity extends ActionBarActivity {
         textToSpeech.shutdown();
         textToSpeech = null;
 
+        indexAdapter = null;
+        setListAdapter(null);
+
         try {
             Log.d(LOG, "Closing RAF.");
             dictRaf.close();
@@ -751,7 +759,7 @@ public class DictionaryActivity extends ActionBarActivity {
         manager.hideSoftInputFromWindow(searchView.getWindowToken(), 0);
     }
 
-    void updateLangButton() {
+    private void updateLangButton() {
         final int flagId = IsoUtils.INSTANCE.getFlagIdForIsoCode(index.shortName);
         if (flagId != 0) {
             languageButton.setImageResource(flagId);
@@ -779,7 +787,8 @@ public class DictionaryActivity extends ActionBarActivity {
                 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();
+            if (!isFinishing())
+                Toast.makeText(this, getString(R.string.TTSbroken), Toast.LENGTH_LONG).show();
         }
     }
 
@@ -807,14 +816,14 @@ public class DictionaryActivity extends ActionBarActivity {
                               searchView.getQuery().toString(), false);
     }
 
-    void onLanguageButtonLongClick(final Context context) {
+    private void onLanguageButtonLongClick(final Context context) {
         final Dialog dialog = new Dialog(context);
         dialog.setContentView(R.layout.select_dictionary_dialog);
         dialog.setTitle(R.string.selectDictionary);
 
         final List<DictionaryInfo> installedDicts = application.getDictionariesOnDevice(null);
 
-        ListView listView = (ListView) dialog.findViewById(android.R.id.list);
+        ListView listView = dialog.findViewById(android.R.id.list);
         final Button button = new Button(listView.getContext());
         final String name = getString(R.string.dictionaryManager);
         button.setText(name);
@@ -837,10 +846,10 @@ public class DictionaryActivity extends ActionBarActivity {
 
                 final LinearLayout result = new LinearLayout(parent.getContext());
 
-                for (int i = 0; dictionaryInfo.indexInfos != null && i < dictionaryInfo.indexInfos.size(); ++i) {
+                for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
                     final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
                     final View button = IsoUtils.INSTANCE.createButton(parent.getContext(),
-                                        dictionaryInfo, indexInfo, application.languageButtonPixels);
+                            indexInfo, application.languageButtonPixels);
                     final IntentLauncher intentLauncher = new IntentLauncher(parent.getContext(),
                             getLaunchIntent(getApplicationContext(),
                                             application.getPath(dictionaryInfo.uncompressedFilename),
@@ -891,7 +900,7 @@ public class DictionaryActivity extends ActionBarActivity {
         dialog.show();
     }
 
-    void onUpDownButton(final boolean up) {
+    private void onUpDownButton(final boolean up) {
         if (isFiltered()) {
             return;
         }
@@ -916,7 +925,7 @@ public class DictionaryActivity extends ActionBarActivity {
         defocusSearchText();
     }
 
-    void onRandomWordButton() {
+    private void onRandomWordButton() {
         int destIndexEntry = rand.nextInt(index.sortedIndexEntries.size());
         final Index.IndexEntry dest = index.sortedIndexEntries.get(destIndexEntry);
         setSearchText(dest.token, false);
@@ -928,8 +937,6 @@ public class DictionaryActivity extends ActionBarActivity {
     // Options Menu
     // --------------------------------------------------------------------------
 
-    final Random random = new Random();
-
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
 
@@ -960,7 +967,7 @@ public class DictionaryActivity extends ActionBarActivity {
             });
         }
 
-        randomWordMenuItem = menu.add(getString(R.string.randomWord));
+        final MenuItem randomWordMenuItem = menu.add(getString(R.string.randomWord));
         randomWordMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
@@ -969,8 +976,6 @@ public class DictionaryActivity extends ActionBarActivity {
             }
         });
 
-        application.onCreateGlobalOptionsMenu(this, menu);
-
         {
             final MenuItem dictionaryManager = menu.add(getString(R.string.dictionaryManager));
             MenuItemCompat.setShowAsAction(dictionaryManager, MenuItem.SHOW_AS_ACTION_NEVER);
@@ -991,7 +996,7 @@ public class DictionaryActivity extends ActionBarActivity {
                     final Context context = getListView().getContext();
                     final Dialog dialog = new Dialog(context);
                     dialog.setContentView(R.layout.about_dictionary_dialog);
-                    final TextView textView = (TextView) dialog.findViewById(R.id.text);
+                    final TextView textView = dialog.findViewById(R.id.text);
 
                     dialog.setTitle(dictFileTitleName);
 
@@ -1041,6 +1046,8 @@ public class DictionaryActivity extends ActionBarActivity {
             });
         }
 
+        DictionaryApplication.onCreateGlobalOptionsMenu(this, menu);
+
         return true;
     }
 
@@ -1056,7 +1063,7 @@ public class DictionaryActivity extends ActionBarActivity {
         if (clickOpensContextMenu && (row instanceof HtmlEntry.Row ||
             (row instanceof TokenRow && ((TokenRow)row).getIndexEntry().htmlEntries.size() > 0))) {
             final List<HtmlEntry> html = row instanceof TokenRow ? ((TokenRow)row).getIndexEntry().htmlEntries : Collections.singletonList(((HtmlEntry.Row)row).getEntry());
-            final String highlight = row instanceof HtmlEntry.Row ? ((HtmlEntry.Row)row).getTokenRow(true).getToken() : null;
+            final String highlight = row instanceof HtmlEntry.Row ? row.getTokenRow(true).getToken() : null;
             final MenuItem open = menu.add("Open");
             open.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
                 public boolean onMenuItemClick(MenuItem item) {
@@ -1181,7 +1188,7 @@ public class DictionaryActivity extends ActionBarActivity {
                 Log.w(LOG, "Skipping findExact on index " + index.shortName);
             }
         }
-        if (numFound != 1 || indexToUse == -1) {
+        if (numFound != 1) {
             indexToUse = defaultIndexToUse;
         }
         // Without this extra delay, the call to jumpToRow that this
@@ -1199,7 +1206,7 @@ public class DictionaryActivity extends ActionBarActivity {
      * Called when user clicks outside of search text, so that they can start
      * typing again immediately.
      */
-    void defocusSearchText() {
+    private void defocusSearchText() {
         // Log.d(LOG, "defocusSearchText");
         // Request focus so that if we start typing again, it clears the text
         // input.
@@ -1210,7 +1217,7 @@ public class DictionaryActivity extends ActionBarActivity {
         // searchView.selectAll();
     }
 
-    protected void onListItemClick(ListView l, View v, int rowIdx, long id) {
+    private void onListItemClick(ListView l, View v, int rowIdx, long id) {
         defocusSearchText();
         if (clickOpensContextMenu && dictRaf != null) {
             openContextMenu(v);
@@ -1223,7 +1230,7 @@ public class DictionaryActivity extends ActionBarActivity {
     }
 
     @SuppressLint("SimpleDateFormat")
-    void onAppendToWordList(final RowBase row) {
+    private void onAppendToWordList(final RowBase row) {
         defocusSearchText();
 
         final StringBuilder rawText = new StringBuilder();
@@ -1240,15 +1247,15 @@ public class DictionaryActivity extends ActionBarActivity {
             out.close();
         } catch (Exception e) {
             Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
-            Toast.makeText(this,
-                           getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),
-                           Toast.LENGTH_LONG).show();
+            if (!isFinishing())
+                Toast.makeText(this,
+                               getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),
+                               Toast.LENGTH_LONG).show();
         }
-        return;
     }
 
     @SuppressWarnings("deprecation")
-    void onCopy(final RowBase row) {
+    private void onCopy(final RowBase row) {
         defocusSearchText();
 
         Log.d(LOG, "Copy, row=" + row);
@@ -1278,7 +1285,7 @@ public class DictionaryActivity extends ActionBarActivity {
             Log.d(LOG, "Trying to hide soft keyboard.");
             final InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
             View focus = getCurrentFocus();
-            if (focus != null) {
+            if (inputManager != null && focus != null) {
                 inputManager.hideSoftInputFromWindow(focus.getWindowToken(),
                                                      InputMethodManager.HIDE_NOT_ALWAYS);
             }
@@ -1310,7 +1317,6 @@ public class DictionaryActivity extends ActionBarActivity {
         // Disable the listener, because sometimes it doesn't work.
         searchView.setOnQueryTextListener(null);
         searchView.setQuery(text, false);
-        moveCursorToRight();
         searchView.setOnQueryTextListener(onQueryTextListener);
 
         if (triggerSearch) {
@@ -1327,24 +1333,6 @@ public class DictionaryActivity extends ActionBarActivity {
         setSearchText(text, triggerSearch, true);
     }
 
-    // private long cursorDelayMillis = 100;
-    private void moveCursorToRight() {
-        // if (searchText.getLayout() != null) {
-        // cursorDelayMillis = 100;
-        // // Surprising, but this can crash when you rotate...
-        // Selection.moveToRightEdge(searchView.getQuery(),
-        // searchText.getLayout());
-        // } else {
-        // uiHandler.postDelayed(new Runnable() {
-        // @Override
-        // public void run() {
-        // moveCursorToRight();
-        // }
-        // }, cursorDelayMillis);
-        // cursorDelayMillis = Math.min(10 * 1000, 2 * cursorDelayMillis);
-        // }
-    }
-
     // --------------------------------------------------------------------------
     // SearchOperation
     // --------------------------------------------------------------------------
@@ -1392,7 +1380,7 @@ public class DictionaryActivity extends ActionBarActivity {
         getListView().setSelected(true);
     }
 
-    static final Pattern WHITESPACE = Pattern.compile("\\s+");
+    private static final Pattern WHITESPACE = Pattern.compile("\\s+");
 
     final class SearchOperation implements Runnable {
 
@@ -1448,7 +1436,7 @@ public class DictionaryActivity extends ActionBarActivity {
                     Log.d(LOG, "interrupted, skipping searchFinished.");
                 }
             } catch (Exception e) {
-                Log.e(LOG, "Failure during search (can happen during Activity close.");
+                Log.e(LOG, "Failure during search (can happen during Activity close): " + e.getMessage());
             } finally {
                 synchronized (this) {
                     done = true;
@@ -1472,12 +1460,6 @@ public class DictionaryActivity extends ActionBarActivity {
             0);
     }
 
-    static ViewGroup.LayoutParams WEIGHT_1 = new LinearLayout.LayoutParams(
-        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 1.0f);
-
-    static ViewGroup.LayoutParams WEIGHT_0 = new LinearLayout.LayoutParams(
-        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT, 0.0f);
-
     final class IndexAdapter extends BaseAdapter {
 
         private static final float PADDING_DEFAULT_DP = 8;
@@ -1504,7 +1486,7 @@ public class DictionaryActivity extends ActionBarActivity {
         IndexAdapter(final Index index, final List<RowBase> rows, final List<String> toHighlight) {
             this.index = index;
             this.rows = rows;
-            this.toHighlight = new LinkedHashSet<String>(toHighlight);
+            this.toHighlight = new LinkedHashSet<>(toHighlight);
             getMetrics();
         }
 
@@ -1519,7 +1501,7 @@ public class DictionaryActivity extends ActionBarActivity {
                 DisplayMetrics dm = new DisplayMetrics();
                 getWindowManager().getDefaultDisplay().getMetrics(dm);
                 scale = dm.density;
-            } catch (NullPointerException e)
+            } catch (NullPointerException ignored)
             {}
             // Convert the dps to pixels, based on density scale
             mPaddingDefault = (int) (PADDING_DEFAULT_DP * scale + 0.5f);
@@ -1577,6 +1559,15 @@ public class DictionaryActivity extends ActionBarActivity {
             }
         }
 
+        private void addBoldSpans(String token, String col1Text, Spannable col1Spannable) {
+            int startPos = 0;
+            while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
+                col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos, startPos
+                                      + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+                startPos += token.length();
+            }
+        }
+
         private TableLayout getView(final int position, PairEntry.Row row, ViewGroup parent,
                                     TableLayout result) {
             final Context context = parent.getContext();
@@ -1584,6 +1575,7 @@ public class DictionaryActivity extends ActionBarActivity {
             final int rowCount = entry.pairs.size();
             if (result == null) {
                 result = new TableLayout(context);
+                result.setStretchAllColumns(true);
                 // Because we have a Button inside a ListView row:
                 // http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1
                 result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
@@ -1597,11 +1589,10 @@ public class DictionaryActivity extends ActionBarActivity {
                 result.removeViews(rowCount, result.getChildCount() - rowCount);
             }
 
-            final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();
-            layoutParams.weight = 0.5f;
-            layoutParams.leftMargin = mPaddingLarge;
-
             for (int r = result.getChildCount(); r < rowCount; ++r) {
+                final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT);
+                layoutParams.leftMargin = mPaddingLarge;
+
                 final TableRow tableRow = new TableRow(result.getContext());
 
                 final TextView col1 = new TextView(tableRow.getContext());
@@ -1610,20 +1601,9 @@ public class DictionaryActivity extends ActionBarActivity {
                     col1.setTextIsSelectable(true);
                     col2.setTextIsSelectable(true);
                 }
+                col1.setTextColor(textColorFg);
+                col2.setTextColor(textColorFg);
 
-                // Set the columns in the table.
-                if (r > 0) {
-                    final TextView bullet = new TextView(tableRow.getContext());
-                    bullet.setText(" •");
-                    tableRow.addView(bullet);
-                }
-                tableRow.addView(col1, layoutParams);
-                if (r > 0) {
-                    final TextView bullet = new TextView(tableRow.getContext());
-                    bullet.setText(" •");
-                    tableRow.addView(bullet);
-                }
-                tableRow.addView(col2, layoutParams);
                 col1.setWidth(1);
                 col2.setWidth(1);
 
@@ -1641,13 +1621,37 @@ public class DictionaryActivity extends ActionBarActivity {
                     col2.setOnLongClickListener(textViewLongClickListenerIndex1);
                 }
 
+                // Set the columns in the table.
+                if (r == 0) {
+                    tableRow.addView(col1, layoutParams);
+                    tableRow.addView(col2, layoutParams);
+                } else {
+                    for (int i = 0; i < 2; i++) {
+                        final TextView bullet = new TextView(tableRow.getContext());
+                        bullet.setText(" • ");
+                        LinearLayout wrapped = new LinearLayout(context);
+                        wrapped.setOrientation(LinearLayout.HORIZONTAL);
+                        LinearLayout.LayoutParams p1 = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, 0);
+                        wrapped.addView(bullet, p1);
+                        LinearLayout.LayoutParams p2 = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1);
+                        wrapped.addView(i == 0 ? col1 : col2, p2);
+                        tableRow.addView(wrapped, layoutParams);
+                    }
+                }
+
                 result.addView(tableRow);
             }
 
             for (int r = 0; r < rowCount; ++r) {
                 final TableRow tableRow = (TableRow)result.getChildAt(r);
-                final TextView col1 = (TextView)tableRow.getChildAt(r == 0 ? 0 : 1);
-                final TextView col2 = (TextView)tableRow.getChildAt(r == 0 ? 1 : 3);
+                View left = tableRow.getChildAt(0);
+                View right = tableRow.getChildAt(1);
+                if (r > 0) {
+                    left = ((ViewGroup)left).getChildAt(1);
+                    right = ((ViewGroup)right).getChildAt(1);
+                }
+                final TextView col1 = (TextView)left;
+                final TextView col2 = (TextView)right;
 
                 // Set what's in the columns.
                 final Pair pair = entry.pairs.get(r);
@@ -1657,16 +1661,12 @@ public class DictionaryActivity extends ActionBarActivity {
                 final Spannable col2Spannable = new SpannableString(col2Text);
 
                 // Bold the token instances in col1.
-                final Set<String> toBold = toHighlight != null ? this.toHighlight : Collections
-                                           .singleton(row.getTokenRow(true).getToken());
-                for (final String token : toBold) {
-                    int startPos = 0;
-                    while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
-                        col1Spannable.setSpan(new StyleSpan(Typeface.BOLD), startPos, startPos
-                                              + token.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
-                        startPos += token.length();
+                if (toHighlight != null) {
+                    for (final String token : toHighlight) {
+                        addBoldSpans(token, col1Text, col1Spannable);
                     }
-                }
+                } else
+                    addBoldSpans(row.getTokenRow(true).getToken(), col1Text, col1Spannable);
 
                 createTokenLinkSpans(col1, col1Spannable, col1Text);
                 createTokenLinkSpans(col2, col2Spannable, col2Text);
@@ -1700,8 +1700,6 @@ public class DictionaryActivity extends ActionBarActivity {
                 textView.setOnLongClickListener(indexIndex > 0 ? textViewLongClickListenerIndex1 : textViewLongClickListenerIndex0);
                 textView.setLongClickable(true);
 
-                // Doesn't work:
-                // textView.setTextColor(android.R.color.secondary_text_light);
                 textView.setTypeface(typeface);
                 if (isTokenRow) {
                     textView.setTextAppearance(context, theme.tokenRowFg);
@@ -1709,6 +1707,7 @@ public class DictionaryActivity extends ActionBarActivity {
                 } else {
                     textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
                 }
+                textView.setTextColor(textColorFg);
                 if (!htmlEntries.isEmpty()) {
                     textView.setClickable(true);
                     textView.setMovementMethod(LinkMovementMethod.getInstance());
@@ -1721,7 +1720,6 @@ public class DictionaryActivity extends ActionBarActivity {
             // Make it so we can long-click on these token rows, too:
             final Spannable textSpannable = new SpannableString(text);
             createTokenLinkSpans(textView, textSpannable, text);
-            textView.setText(textSpannable);
 
             if (!htmlEntries.isEmpty()) {
                 final ClickableSpan clickableSpan = new ClickableSpan() {
@@ -1729,7 +1727,7 @@ public class DictionaryActivity extends ActionBarActivity {
                     public void onClick(View widget) {
                     }
                 };
-                ((Spannable) textView.getText()).setSpan(clickableSpan, 0, text.length(),
+                textSpannable.setSpan(clickableSpan, 0, text.length(),
                         Spannable.SPAN_INCLUSIVE_INCLUSIVE);
                 textView.setOnClickListener(new OnClickListener() {
                     @Override
@@ -1738,6 +1736,7 @@ public class DictionaryActivity extends ActionBarActivity {
                     }
                 });
             }
+            textView.setText(textSpannable);
             return textView;
         }
 
@@ -1758,7 +1757,7 @@ public class DictionaryActivity extends ActionBarActivity {
 
     }
 
-    static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}\\p{M}\\p{N}]+");
+    private static final Pattern CHAR_DASH = Pattern.compile("['\\p{L}\\p{M}\\p{N}]+");
 
     private void createTokenLinkSpans(final TextView textView, final Spannable spannable,
                                       final String text) {
@@ -1767,15 +1766,15 @@ public class DictionaryActivity extends ActionBarActivity {
         textView.setMovementMethod(LinkMovementMethod.getInstance());
         final Matcher matcher = CHAR_DASH.matcher(text);
         while (matcher.find()) {
-            spannable.setSpan(new NonLinkClickableSpan(textColorFg), matcher.start(),
+            spannable.setSpan(new NonLinkClickableSpan(), matcher.start(),
                               matcher.end(),
                               Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
         }
     }
 
-    String selectedSpannableText = null;
+    private String selectedSpannableText = null;
 
-    int selectedSpannableIndex = -1;
+    private int selectedSpannableIndex = -1;
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
@@ -1804,22 +1803,22 @@ public class DictionaryActivity extends ActionBarActivity {
         }
     }
 
-    final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
+    private final TextViewLongClickListener textViewLongClickListenerIndex0 = new TextViewLongClickListener(
         0);
 
-    final TextViewLongClickListener textViewLongClickListenerIndex1 = new TextViewLongClickListener(
+    private final TextViewLongClickListener textViewLongClickListenerIndex1 = new TextViewLongClickListener(
         1);
 
     // --------------------------------------------------------------------------
     // SearchText
     // --------------------------------------------------------------------------
 
-    void onSearchTextChange(final String text) {
+    private void onSearchTextChange(final String text) {
         if ("thadolina".equals(text)) {
             final Dialog dialog = new Dialog(getListView().getContext());
             dialog.setContentView(R.layout.thadolina_dialog);
             dialog.setTitle("Ti amo, amore mio!");
-            final ImageView imageView = (ImageView) dialog.findViewById(R.id.thadolina_image);
+            final ImageView imageView = dialog.findViewById(R.id.thadolina_image);
             imageView.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -1853,11 +1852,11 @@ public class DictionaryActivity extends ActionBarActivity {
     // Filtered results.
     // --------------------------------------------------------------------------
 
-    boolean isFiltered() {
+    private boolean isFiltered() {
         return rowsToShow != null;
     }
 
-    void setFiltered(final SearchOperation searchOperation) {
+    private void setFiltered(final SearchOperation searchOperation) {
         if (nextWordMenuItem != null) {
             nextWordMenuItem.setEnabled(false);
             previousWordMenuItem.setEnabled(false);
@@ -1866,7 +1865,7 @@ public class DictionaryActivity extends ActionBarActivity {
         setListAdapter(new IndexAdapter(index, rowsToShow, searchOperation.searchTokens));
     }
 
-    void clearFiltered() {
+    private void clearFiltered() {
         if (nextWordMenuItem != null) {
             nextWordMenuItem.setEnabled(true);
             previousWordMenuItem.setEnabled(true);