About dialog, added pictures, multi word search.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryManagerActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 73b8b40b4912f7dab5b93801ae27263f537a7971..f055b8ebf4fbebe732c0eeda9505baa579d8525b 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -40,9 +40,11 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.util.IntentLauncher;
 import com.hughes.util.StringUtil;
 
@@ -54,6 +56,14 @@ public class DictionaryManagerActivity extends ListActivity {
   DictionaryApplication application;
   Adapter adapter;
   
+  public static Intent getLaunchIntent() {
+    final Intent intent = new Intent();
+    intent.setClassName(DictionaryManagerActivity.class.getPackage().getName(),
+        DictionaryManagerActivity.class.getName());
+    intent.putExtra(C.CAN_AUTO_LAUNCH_DICT, false);
+    return intent;
+  }
+  
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     Log.d(LOG, "onCreate:" + this);
@@ -144,26 +154,7 @@ public class DictionaryManagerActivity extends ListActivity {
   }
 
   public boolean onCreateOptionsMenu(final Menu menu) {
-    final MenuItem about = menu.add(getString(R.string.about));
-    about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        final Intent intent = new Intent().setClassName(AboutActivity.class
-            .getPackage().getName(), AboutActivity.class.getCanonicalName());
-        startActivity(intent);
-        return false;
-      }
-    });
-    
-    final MenuItem preferences = menu.add(getString(R.string.preferences));
-    preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      public boolean onMenuItemClick(final MenuItem menuItem) {
-        PreferenceActivity.prefsMightHaveChanged = true;
-        startActivity(new Intent(DictionaryManagerActivity.this,
-            PreferenceActivity.class));
-        return false;
-      }
-    });
-    
+    application.onCreateGlobalOptionsMenu(this, menu);
     return true;
   }
   
@@ -224,12 +215,28 @@ public class DictionaryManagerActivity extends ListActivity {
     public View getView(final int position, final View convertView, final ViewGroup parent) {
       final DictionaryInfo dictionaryInfo = getItem(position);
       final LinearLayout result = new LinearLayout(parent.getContext());
+      result.setOrientation(LinearLayout.VERTICAL);
+
+      final LinearLayout row = new LinearLayout(parent.getContext());
+      row.setOrientation(LinearLayout.HORIZONTAL);
+      result.addView(row);
+
+      {
+      final TextView textView = new TextView(parent.getContext());
+      final String name = application.getDictionaryName(dictionaryInfo.uncompressedFilename);
+      textView.setText(name);
+      textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22);
+      row.addView(textView);
+      LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+      layoutParams.weight = 1.0f;
+      textView.setLayoutParams(layoutParams);
+      }
       
       final boolean updateAvailable = application.updateAvailable(dictionaryInfo);
       final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename); 
       if ((!application.isDictionaryOnDevice(dictionaryInfo.uncompressedFilename) || updateAvailable) && downloadable != null) {
         final Button downloadButton = new Button(parent.getContext());
-        downloadButton.setText(getString(updateAvailable ? R.string.updateButton : R.string.downloadButton));
+        downloadButton.setText(getString(updateAvailable ? R.string.updateButton : R.string.downloadButton, downloadable.zipBytes / 1024.0 / 1024.0));
         downloadButton.setOnClickListener(new IntentLauncher(parent.getContext(), DownloadActivity
             .getLaunchIntent(downloadable.downloadUrl,
                 application.getPath(dictionaryInfo.uncompressedFilename).getPath() + ".zip",
@@ -243,15 +250,31 @@ public class DictionaryManagerActivity extends ListActivity {
         layoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
         layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
         downloadButton.setLayoutParams(layoutParams);
-        result.addView(downloadButton);
+        row.addView(downloadButton);
+      } else {
+        final ImageView checkMark = new ImageView(parent.getContext());
+        checkMark.setImageResource(R.drawable.btn_check_buttonless_on);
+        row.addView(checkMark);
       }
 
-      final TextView textView = new TextView(parent.getContext());
-      final String name = application.getDictionaryName(dictionaryInfo.uncompressedFilename);
-      textView.setText(name);
-      textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22);
-      result.addView(textView);
-
+      // Add the information about each index.
+      final LinearLayout row2 = new LinearLayout(parent.getContext());
+      row2.setOrientation(LinearLayout.HORIZONTAL);
+      final LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+      row2.setLayoutParams(layoutParams);
+      result.addView(row2);
+      final StringBuilder builder = new StringBuilder();
+      for (final IndexInfo indexInfo : dictionaryInfo.indexInfos) {
+        if (builder.length() > 0) {
+          builder.append(" | ");
+        }
+        builder.append(getString(R.string.indexInfo, indexInfo.shortName, indexInfo.mainTokenCount));
+      }
+      final TextView indexView = new TextView(parent.getContext());
+      indexView.setText(builder.toString());
+      row2.addView(indexView);
+      
+      
       // 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);
@@ -270,12 +293,4 @@ public class DictionaryManagerActivity extends ListActivity {
     }
   }
 
-  public static Intent getLaunchIntent() {
-    final Intent intent = new Intent();
-    intent.setClassName(DictionaryManagerActivity.class.getPackage().getName(),
-        DictionaryManagerActivity.class.getName());
-    intent.putExtra(C.CAN_AUTO_LAUNCH_DICT, false);
-    return intent;
-  }
-
 }