]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryActivity.java
Ensure there is no ListAdapter using the closed file.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java
index 7517441d49c034cce939e2f661c894a4140e44c2..863e20b81bffcaaefa20935baef6ac467af99715 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) {
@@ -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();
@@ -1541,36 +1547,66 @@ 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 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);
+                // 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 = 0; r < rowCount; ++r) {
+            for (int r = result.getChildCount(); r < rowCount; ++r) {
                 final TableRow tableRow = new TableRow(result.getContext());
 
                 final TextView col1 = new TextView(tableRow.getContext());
@@ -1596,19 +1632,38 @@ public class DictionaryActivity extends ActionBarActivity {
                 col1.setWidth(1);
                 col2.setWidth(1);
 
-                // Set what's in the columns.
+                col1.setTypeface(typeface);
+                col2.setTypeface(typeface);
+                col1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+                col2.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
+                // col2.setBackgroundResource(theme.otherLangBg);
+
+                if (index.swapPairEntries) {
+                    col2.setOnLongClickListener(textViewLongClickListenerIndex0);
+                    col1.setOnLongClickListener(textViewLongClickListenerIndex1);
+                } else {
+                    col1.setOnLongClickListener(textViewLongClickListenerIndex0);
+                    col2.setOnLongClickListener(textViewLongClickListenerIndex1);
+                }
+
+                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);
 
+                // 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);
+                final Spannable col1Spannable = new SpannableString(col1Text);
+                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());
-                final Spannable col1Spannable = (Spannable) col1.getText();
                 for (final String token : toBold) {
                     int startPos = 0;
                     while ((startPos = col1Text.indexOf(token, startPos)) != -1) {
@@ -1619,35 +1674,12 @@ public class DictionaryActivity extends ActionBarActivity {
                 }
 
                 createTokenLinkSpans(col1, col1Spannable, col1Text);
-                createTokenLinkSpans(col2, (Spannable) col2.getText(), col2Text);
-
-                col1.setTypeface(typeface);
-                col2.setTypeface(typeface);
-                col1.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
-                col2.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp);
-                // col2.setBackgroundResource(theme.otherLangBg);
+                createTokenLinkSpans(col2, col2Spannable, col2Text);
 
-                if (index.swapPairEntries) {
-                    col2.setOnLongClickListener(textViewLongClickListenerIndex0);
-                    col1.setOnLongClickListener(textViewLongClickListenerIndex1);
-                } else {
-                    col1.setOnLongClickListener(textViewLongClickListenerIndex0);
-                    col2.setOnLongClickListener(textViewLongClickListenerIndex1);
-                }
-
-                result.addView(tableRow);
+                col1.setText(col1Spannable);
+                col2.setText(col2Spannable);
             }
 
-            // 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);
-
             result.setOnClickListener(new TextView.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -1658,42 +1690,43 @@ 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);
+
+                // Doesn't work:
+                // textView.setTextColor(android.R.color.secondary_text_light);
+                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);
+                }
+                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);
+            textView.setText(textSpannable);
 
             if (!htmlEntries.isEmpty()) {
                 final ClickableSpan clickableSpan = new ClickableSpan() {
@@ -1703,33 +1736,23 @@ public class DictionaryActivity extends ActionBarActivity {
                 };
                 ((Spannable) textView.getText()).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;
+            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,