Added help activity, num bytes in download, index info (but screwed up),

[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 ca47646280134318683f8264a5b0be3e0f818719..66aee42061b2aa9267dc54c712527eaf7b335ee7 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -58,7 +58,6 @@ import android.view.MotionEvent;
 import android.view.View;\r
 import android.view.View.OnClickListener;\r
 import android.view.View.OnLongClickListener;\r
-import android.view.ViewGroup.LayoutParams;\r
 import android.view.ViewGroup;\r
 import android.view.inputmethod.InputMethodManager;\r
 import android.widget.AdapterView;\r
@@ -83,6 +82,7 @@ import com.hughes.android.dictionary.engine.RowBase;
 import com.hughes.android.dictionary.engine.TokenRow;\r
 import com.hughes.android.dictionary.engine.TransliteratorManager;\r
 import com.hughes.android.util.IntentLauncher;\r
+import com.hughes.android.util.NonLinkClickableSpan;\r
 \r
 public class DictionaryActivity extends ListActivity {\r
 \r
@@ -155,10 +155,9 @@ public class DictionaryActivity extends ListActivity {
     // Clear them so that if something goes wrong, we won't relaunch.\r
     clearDictionaryPrefs(this);\r
     \r
-    \r
     final Intent intent = getIntent();\r
     dictFile = new File(intent.getStringExtra(C.DICT_FILE));\r
-\r
+    \r
     try {\r
       final String name = application.getDictionaryName(dictFile.getName());\r
       this.setTitle("QuickDic: " + name);\r
@@ -521,18 +520,7 @@ public class DictionaryActivity extends ListActivity {
   \r
   @Override\r
   public boolean onCreateOptionsMenu(final Menu menu) {\r
-    \r
-    {\r
-      final MenuItem preferences = menu.add(getString(R.string.preferences));\r
-      preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
-        public boolean onMenuItemClick(final MenuItem menuItem) {\r
-          PreferenceActivity.prefsMightHaveChanged = true;\r
-          startActivity(new Intent(DictionaryActivity.this,\r
-              PreferenceActivity.class));\r
-          return false;\r
-        }\r
-      });\r
-    }\r
+    application.onCreateGlobalOptionsMenu(this, menu);\r
 \r
     {\r
       final MenuItem dictionaryList = menu.add(getString(R.string.dictionaryManager));\r
@@ -545,18 +533,6 @@ public class DictionaryActivity extends ListActivity {
       });\r
     }\r
 \r
-    {\r
-      final MenuItem about = menu.add(getString(R.string.about));\r
-      about.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
-        public boolean onMenuItemClick(final MenuItem menuItem) {\r
-          final Intent intent = new Intent().setClassName(AboutActivity.class\r
-              .getPackage().getName(), AboutActivity.class.getCanonicalName());\r
-          startActivity(intent);\r
-          return false;\r
-        }\r
-      });\r
-    }\r
-\r
     return true;\r
   }\r
 \r
@@ -824,18 +800,16 @@ public class DictionaryActivity extends ListActivity {
     }\r
 \r
     private View getView(PairEntry.Row row, ViewGroup parent, final View convertView) {\r
-      final LinearLayout result = new LinearLayout(parent.getContext());\r
+      final TableLayout result = new TableLayout(parent.getContext());\r
       final PairEntry entry = row.getEntry();\r
       final int rowCount = entry.pairs.size();\r
       for (int r = 0; r < rowCount; ++r) {\r
-        final LinearLayout tableRow = new LinearLayout(result.getContext());\r
-        final LinearLayout.LayoutParams rowLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);\r
-        tableRow.setLayoutParams(rowLayoutParams);\r
+        final TableRow tableRow = new TableRow(result.getContext());\r
 \r
         final TextView col1 = new TextView(tableRow.getContext());\r
         final TextView col2 = new TextView(tableRow.getContext());\r
-        final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);\r
-        layoutParams.weight = 1.0f;\r
+        final TableRow.LayoutParams layoutParams = new TableRow.LayoutParams();\r
+        layoutParams.weight = 0.5f;\r
 \r
         // Set the columns in the table.\r
         if (r > 0) {\r
@@ -853,8 +827,8 @@ public class DictionaryActivity extends ListActivity {
           tableRow.addView(bullet);\r
         }\r
         tableRow.addView(col2, layoutParams);\r
-        col1.setWidth(0);\r
-        col2.setWidth(0);\r
+        col1.setWidth(1);\r
+        col2.setWidth(1);\r
         \r
         // Set what's in the columns.\r
 \r