]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryActivity.java
Run automated code cleanup.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java
index 8df2a2601ac2178b17503f1b96cf9076aff0dd7e..76915dfa9c48f90affb7eb896877e74d28166834 100644 (file)
@@ -39,6 +39,7 @@ import android.support.v7.widget.Toolbar;
 import android.text.ClipboardManager;
 import android.text.InputType;
 import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
 import android.text.style.StyleSpan;
@@ -229,6 +230,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) {
@@ -257,7 +260,7 @@ public class DictionaryActivity extends ActionBarActivity {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
         // Don't auto-launch if this fails.
-        prefs.edit().remove(C.DICT_FILE).commit();
+        prefs.edit().remove(C.DICT_FILE).remove(C.INDEX_SHORT_NAME).commit();
 
         setContentView(R.layout.dictionary_activity);
 
@@ -709,6 +712,9 @@ public class DictionaryActivity extends ActionBarActivity {
         textToSpeech.shutdown();
         textToSpeech = null;
 
+        indexAdapter = null;
+        setListAdapter(null);
+
         try {
             Log.d(LOG, "Closing RAF.");
             dictRaf.close();
@@ -778,7 +784,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();
         }
     }
 
@@ -813,7 +820,7 @@ public class DictionaryActivity extends ActionBarActivity {
 
         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);
@@ -968,8 +975,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);
@@ -990,7 +995,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);
 
@@ -1040,6 +1045,8 @@ public class DictionaryActivity extends ActionBarActivity {
             });
         }
 
+        DictionaryApplication.onCreateGlobalOptionsMenu(this, menu);
+
         return true;
     }
 
@@ -1055,7 +1062,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) {
@@ -1541,36 +1548,75 @@ public class DictionaryActivity extends ActionBarActivity {
         }
 
         @Override
-        public TableLayout getView(int position, View convertView, ViewGroup parent) {
-            final TableLayout result;
-            if (convertView instanceof TableLayout) {
-                result = (TableLayout) convertView;
-                result.removeAllViews();
+        public int getViewTypeCount() {
+            return 5;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            final RowBase row = getItem(position);
+            if (row instanceof PairEntry.Row) {
+                final PairEntry entry = ((PairEntry.Row)row).getEntry();
+                final int rowCount = entry.pairs.size();
+                return rowCount > 1 ? 1 : 0;
+            } else if (row instanceof TokenRow) {
+                final IndexEntry indexEntry = ((TokenRow)row).getIndexEntry();
+                return indexEntry.htmlEntries.isEmpty() ? 2 : 3;
+            } else if (row instanceof HtmlEntry.Row) {
+                return 4;
             } else {
-                result = new TableLayout(parent.getContext());
+                throw new IllegalArgumentException("Unsupported Row type: " + row.getClass());
             }
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
             final RowBase row = getItem(position);
             if (row instanceof PairEntry.Row) {
-                return getView(position, (PairEntry.Row) row, parent, result);
+                return getView(position, (PairEntry.Row) row, parent, (TableLayout)convertView);
             } else if (row instanceof TokenRow) {
-                return getView((TokenRow) row, parent, result);
+                return getView((TokenRow) row, parent, (TextView)convertView);
             } else if (row instanceof HtmlEntry.Row) {
-                return getView((HtmlEntry.Row) row, parent, result);
+                return getView((HtmlEntry.Row) row, parent, (TextView)convertView);
             } else {
                 throw new IllegalArgumentException("Unsupported Row type: " + row.getClass());
             }
         }
 
+        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,
-                                    final TableLayout result) {
+                                    TableLayout result) {
+            final Context context = parent.getContext();
             final PairEntry entry = row.getEntry();
             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);
+                result.setClickable(true);
+                result.setFocusable(false);
+                result.setLongClickable(true);
+//                result.setBackgroundResource(android.R.drawable.menuitem_background);
+
+                result.setBackgroundResource(theme.normalRowBg);
+            } else if (result.getChildCount() > rowCount) {
+                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;
 
-            for (int r = 0; r < rowCount; ++r) {
                 final TableRow tableRow = new TableRow(result.getContext());
 
                 final TextView col1 = new TextView(tableRow.getContext());
@@ -1579,51 +1625,25 @@ 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(" • ");
+                    bullet.setText(" •");
                     tableRow.addView(bullet);
                 }
                 tableRow.addView(col1, layoutParams);
-                final TextView margin = new TextView(tableRow.getContext());
-                margin.setText(" ");
-                tableRow.addView(margin);
                 if (r > 0) {
                     final TextView bullet = new TextView(tableRow.getContext());
-                    bullet.setText(" • ");
+                    bullet.setText(" •");
                     tableRow.addView(bullet);
                 }
                 tableRow.addView(col2, layoutParams);
                 col1.setWidth(1);
                 col2.setWidth(1);
 
-                // Set what's in the columns.
-
-                final Pair pair = entry.pairs.get(r);
-                final String col1Text = index.swapPairEntries ? pair.lang2 : pair.lang1;
-                final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;
-
-                col1.setText(col1Text, TextView.BufferType.SPANNABLE);
-                col2.setText(col2Text, TextView.BufferType.SPANNABLE);
-
-                // Bold the token instances in col1.
-                final Set<String> toBold = toHighlight != null ? this.toHighlight : Collections
-                                           .singleton(row.getTokenRow(true).getToken());
-                final Spannable col1Spannable = (Spannable) col1.getText();
-                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();
-                    }
-                }
-
-                createTokenLinkSpans(col1, col1Spannable, col1Text);
-                createTokenLinkSpans(col2, (Spannable) col2.getText(), col2Text);
-
                 col1.setTypeface(typeface);
                 col2.setTypeface(typeface);
                 col1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
@@ -1641,15 +1661,32 @@ public class DictionaryActivity extends ActionBarActivity {
                 result.addView(tableRow);
             }
 
-            // 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);
-            result.setClickable(true);
-            result.setFocusable(false);
-            result.setLongClickable(true);
-//            result.setBackgroundResource(android.R.drawable.menuitem_background);
+            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);
+
+                // Set what's in the columns.
+                final Pair pair = entry.pairs.get(r);
+                final String col1Text = index.swapPairEntries ? pair.lang2 : pair.lang1;
+                final String col2Text = index.swapPairEntries ? pair.lang1 : pair.lang2;
+                final Spannable col1Spannable = new SpannableString(col1Text);
+                final Spannable col2Spannable = new SpannableString(col2Text);
+
+                // Bold the token instances in col1.
+                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);
 
-            result.setBackgroundResource(theme.normalRowBg);
+                col1.setText(col1Spannable);
+                col2.setText(col2Spannable);
+            }
 
             result.setOnClickListener(new TextView.OnClickListener() {
                 @Override
@@ -1661,42 +1698,41 @@ public class DictionaryActivity extends ActionBarActivity {
             return result;
         }
 
-        private TableLayout getPossibleLinkToHtmlEntryView(final boolean isTokenRow,
+        private TextView getPossibleLinkToHtmlEntryView(final boolean isTokenRow,
                 final String text, final boolean hasMainEntry, final List<HtmlEntry> htmlEntries,
-                final String htmlTextToHighlight, ViewGroup parent, final TableLayout result) {
+                final String htmlTextToHighlight, ViewGroup parent, TextView textView) {
             final Context context = parent.getContext();
+            if (textView == null) {
+                textView = new TextView(context);
+                // set up things invariant across one ItemViewType
+                // ItemViewTypes handled here are:
+                // 2: isTokenRow == true, htmlEntries.isEmpty() == true
+                // 3: isTokenRow == true, htmlEntries.isEmpty() == false
+                // 4: isTokenRow == false, htmlEntries.isEmpty() == false
+                textView.setPadding(isTokenRow ? mPaddingDefault : mPaddingLarge, mPaddingDefault, mPaddingDefault, 0);
+                textView.setOnLongClickListener(indexIndex > 0 ? textViewLongClickListenerIndex1 : textViewLongClickListenerIndex0);
+                textView.setLongClickable(true);
+
+                textView.setTypeface(typeface);
+                if (isTokenRow) {
+                    textView.setTextAppearance(context, theme.tokenRowFg);
+                    textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 4 * fontSizeSp / 3);
+                } else {
+                    textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+                }
+                textView.setTextColor(textColorFg);
+                if (!htmlEntries.isEmpty()) {
+                    textView.setClickable(true);
+                    textView.setMovementMethod(LinkMovementMethod.getInstance());
+                }
+            }
 
-            final TableRow tableRow = new TableRow(result.getContext());
-            tableRow.setBackgroundResource(hasMainEntry ? theme.tokenRowMainBg
+            textView.setBackgroundResource(hasMainEntry ? theme.tokenRowMainBg
                                            : theme.tokenRowOtherBg);
-            if (isTokenRow) {
-                tableRow.setPadding(mPaddingDefault, mPaddingDefault, mPaddingDefault, 0);
-            } else {
-                tableRow.setPadding(mPaddingLarge, mPaddingDefault, mPaddingDefault, 0);
-            }
-            result.addView(tableRow);
 
             // Make it so we can long-click on these token rows, too:
-            final TextView textView = new TextView(context);
-            textView.setText(text, BufferType.SPANNABLE);
-            createTokenLinkSpans(textView, (Spannable) textView.getText(), text);
-            textView.setOnLongClickListener(indexIndex > 0 ? textViewLongClickListenerIndex1 : textViewLongClickListenerIndex0);
-            result.setLongClickable(true);
-
-            // Doesn't work:
-            // textView.setTextColor(android.R.color.secondary_text_light);
-            textView.setTypeface(typeface);
-            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);
+            final Spannable textSpannable = new SpannableString(text);
+            createTokenLinkSpans(textView, textSpannable, text);
 
             if (!htmlEntries.isEmpty()) {
                 final ClickableSpan clickableSpan = new ClickableSpan() {
@@ -1704,35 +1740,26 @@ 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);
-                result.setClickable(true);
-                textView.setClickable(true);
-                textView.setMovementMethod(LinkMovementMethod.getInstance());
                 textView.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         showHtml(htmlEntries, htmlTextToHighlight);
                     }
                 });
-                result.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        textView.performClick();
-                    }
-                });
             }
-            result.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
-            return result;
+            textView.setText(textSpannable);
+            return textView;
         }
 
-        private TableLayout getView(TokenRow row, ViewGroup parent, final TableLayout result) {
+        private TextView getView(TokenRow row, ViewGroup parent, final TextView 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) {
+        private TextView getView(HtmlEntry.Row row, ViewGroup parent, final TextView result) {
             final HtmlEntry htmlEntry = row.getEntry();
             final TokenRow tokenRow = row.getTokenRow(true);
             return getPossibleLinkToHtmlEntryView(false,
@@ -1752,7 +1779,7 @@ 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);
         }
@@ -1804,7 +1831,7 @@ public class DictionaryActivity extends ActionBarActivity {
             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) {