]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryManagerActivity.java
Merged. Switched back to name "Preferences" instead of "Settings".
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryManagerActivity.java
index 44d764165e0395f2b8d4648fcb31b3614c9ae50e..af50112dbc98f36ff15b0693e5ffd7b24cdf4bc3 100644 (file)
 
 package com.hughes.android.dictionary;
 
-import java.io.File;
-import java.util.List;
-
-import android.app.AlertDialog;
-import android.app.ListActivity;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
+import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.webkit.WebView;
 import android.widget.AdapterView;
 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.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
+import android.widget.ImageButton;
 import android.widget.TextView;
+import android.widget.ToggleButton;
 
+import com.actionbarsherlock.app.SherlockListActivity;
+import com.actionbarsherlock.view.Menu;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.util.IntentLauncher;
-import com.hughes.util.StringUtil;
 
-public class DictionaryManagerActivity extends ListActivity {
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DictionaryManagerActivity extends SherlockListActivity {
 
   static final String LOG = "QuickDic";
-  static boolean canAutoLaunch = true;
+  static boolean blockAutoLaunch = false;
 
   DictionaryApplication application;
   Adapter adapter;
   
+  EditText filterText;
+  ToggleButton showLocal;
+  
+  Handler uiHandler;
+  
   public static Intent getLaunchIntent() {
     final Intent intent = new Intent();
     intent.setClassName(DictionaryManagerActivity.class.getPackage().getName(),
@@ -73,7 +79,41 @@ public class DictionaryManagerActivity extends ListActivity {
     application = (DictionaryApplication) getApplication();
 
     // UI init.
-    setContentView(R.layout.list_activity);
+    setContentView(R.layout.dictionary_manager_activity);
+    
+    filterText = (EditText) findViewById(R.id.filterText);
+    showLocal = (ToggleButton) findViewById(R.id.showLocal);
+    
+    filterText.addTextChangedListener(new TextWatcher() {
+      @Override
+      public void onTextChanged(CharSequence s, int start, int before, int count) {
+      }
+      
+      @Override
+      public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+      }
+      
+      @Override
+      public void afterTextChanged(Editable s) {
+        onFilterTextChanged();
+      }
+    });
+    
+    final ImageButton clearSearchText = (ImageButton) findViewById(R.id.ClearSearchTextButton);
+    clearSearchText.setOnClickListener(new View.OnClickListener() {
+        @Override
+        public void onClick(View arg0) {
+            filterText.setText("");
+            filterText.requestFocus();
+        }
+    });
+    
+    showLocal.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+      @Override
+      public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        onShowLocalChanged();
+      }
+    });
 
     getListView().setOnItemClickListener(new OnItemClickListener() {
       @Override
@@ -88,48 +128,26 @@ public class DictionaryManagerActivity extends ListActivity {
     // ContextMenu.
     registerForContextMenu(getListView());
 
+    blockAutoLaunch = false;
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
     final String thanksForUpdatingLatestVersion = getString(R.string.thanksForUpdatingVersion);
     if (!prefs.getString(C.THANKS_FOR_UPDATING_VERSION, "").equals(thanksForUpdatingLatestVersion)) {
-      canAutoLaunch = false;
-      final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-      builder.setCancelable(false);
-      final WebView webView = new WebView(getApplicationContext());
-      webView.loadData(StringUtil.readToString(getResources().openRawResource(R.raw.whats_new)), "text/html", "utf-8");
-      builder.setView(webView);
-      builder.setNegativeButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-          public void onClick(DialogInterface dialog, int id) {
-               dialog.cancel();
-          }
-      });
-      final AlertDialog alert = builder.create();
-      WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
-      layoutParams.copyFrom(alert.getWindow().getAttributes());
-      layoutParams.width = WindowManager.LayoutParams.FILL_PARENT;
-      layoutParams.height = WindowManager.LayoutParams.FILL_PARENT;
-      alert.show();
-      alert.getWindow().setAttributes(layoutParams);
+      blockAutoLaunch = true;
+      startActivity(HtmlDisplayActivity.getWhatsNewLaunchIntent());
       prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion).commit();
     }
-    
-    if (!getIntent().getBooleanExtra(C.CAN_AUTO_LAUNCH_DICT, true)) {
-      canAutoLaunch = false;
-    }
   }
   
-  private void onClick(int index) {
-    final DictionaryInfo dictionaryInfo = adapter.getItem(index);
-    final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
-    if (!application.isDictionaryOnDevice(dictionaryInfo.uncompressedFilename) && downloadable != null) {
-      final Intent intent = DownloadActivity
-          .getLaunchIntent(downloadable.downloadUrl,
-              application.getPath(dictionaryInfo.uncompressedFilename).getPath() + ".zip",
-              dictionaryInfo.dictInfo);
-      startActivity(intent);
-    } else {
-      final Intent intent = DictionaryActivity.getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename), 0, "");
-      startActivity(intent);
-    }
+  @Override
+  protected void onStart() {
+    super.onStart();
+    uiHandler = new Handler();
+  }
+  
+  @Override
+  protected void onStop() {
+    super.onStop();
+    uiHandler = null;
   }
   
   @Override
@@ -137,20 +155,38 @@ public class DictionaryManagerActivity extends ListActivity {
     super.onResume();
     
     if (PreferenceActivity.prefsMightHaveChanged) {
-      PreferenceActivity.prefsMightHaveChanged = false;
+        PreferenceActivity.prefsMightHaveChanged = false;
       finish();
       startActivity(getIntent());
     }
     
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-    if (canAutoLaunch && prefs.contains(C.DICT_FILE) && prefs.contains(C.INDEX_INDEX)) {
-      canAutoLaunch = false;  // Only autolaunch once per-process, on startup.
+    showLocal.setChecked(prefs.getBoolean(C.SHOW_LOCAL, false));
+    
+    if (!blockAutoLaunch &&
+        getIntent().getBooleanExtra(C.CAN_AUTO_LAUNCH_DICT, true) &&
+        prefs.contains(C.DICT_FILE) && 
+        prefs.contains(C.INDEX_INDEX)) {
       Log.d(LOG, "Skipping Dictionary List, going straight to dictionary.");
       startActivity(DictionaryActivity.getLaunchIntent(new File(prefs.getString(C.DICT_FILE, "")), prefs.getInt(C.INDEX_INDEX, 0), prefs.getString(C.SEARCH_TOKEN, "")));
-      // Don't finish, so that user can hit back and get here.
-      //finish();
+      finish();
       return;
     }
+    
+    application.backgroundUpdateDictionaries(new Runnable() {
+      @Override
+      public void run() {
+        if (uiHandler == null) {
+          return;
+        }
+        uiHandler.post(new Runnable() {
+          @Override
+          public void run() {
+            setListAdapter(adapter = new Adapter());
+          }
+        });
+      }
+    });
 
     setListAdapter(adapter = new Adapter());
   }
@@ -170,11 +206,11 @@ public class DictionaryManagerActivity extends ListActivity {
     final int position = adapterContextMenuInfo.position;
     final DictionaryInfo dictionaryInfo = adapter.getItem(position);
     
-    if (position > 0) {
-      final MenuItem moveToTopMenuItem = menu.add(R.string.moveToTop);
-      moveToTopMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+    if (position > 0 && application.isDictionaryOnDevice(dictionaryInfo.uncompressedFilename)) {
+      final android.view.MenuItem moveToTopMenuItem = menu.add(R.string.moveToTop);
+      moveToTopMenuItem.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
         @Override
-        public boolean onMenuItemClick(MenuItem item) {
+        public boolean onMenuItemClick(android.view.MenuItem item) {
           application.moveDictionaryToTop(dictionaryInfo);
           setListAdapter(adapter = new Adapter());
           return true;
@@ -182,21 +218,85 @@ public class DictionaryManagerActivity extends ListActivity {
       });
     }
 
-    final MenuItem deleteMenuItem = menu.add(R.string.deleteDictionary);
-    deleteMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+    final android.view.MenuItem deleteMenuItem = menu.add(R.string.deleteDictionary);
+    deleteMenuItem.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
       @Override
-      public boolean onMenuItemClick(MenuItem item) {
+      public boolean onMenuItemClick(android.view.MenuItem item) {
         application.deleteDictionary(dictionaryInfo);
         setListAdapter(adapter = new Adapter());
         return true;
       }
     });
 
+    final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
+    if (downloadable != null) {
+      final android.view.MenuItem downloadMenuItem = menu.add(getString(R.string.downloadButton, downloadable.zipBytes/1024.0/1024.0));
+      downloadMenuItem.setOnMenuItemClickListener(new android.view.MenuItem.OnMenuItemClickListener() {
+        @Override
+        public boolean onMenuItemClick(android.view.MenuItem item) {
+          final Intent intent = getDownloadIntent(downloadable);
+          startActivity(intent);
+          setListAdapter(adapter = new Adapter());
+          return true;
+        }
+      });
+    }
+
+  }
+
+  private Intent getDownloadIntent(final DictionaryInfo downloadable) {
+//      DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
+//      DownloadManager.Request request = new DownloadManager.Request(Uri.parse(""));
+//      long id = downloadManager.enqueue(request);
+//      DownloadManager.Query query;
+      return null;
+  }
+  
+  private void onFilterTextChanged() {
+    setListAdapter(adapter = new Adapter());
+
   }
 
+  private void onShowLocalChanged() {
+    setListAdapter(adapter = new Adapter());
+    Editor prefs = PreferenceManager.getDefaultSharedPreferences(this).edit();
+    prefs.putBoolean(C.SHOW_LOCAL, showLocal.isChecked());
+    prefs.commit();
+  }
+  
+  private void onClick(int index) {
+    final DictionaryInfo dictionaryInfo = adapter.getItem(index);
+    final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
+    if (!application.isDictionaryOnDevice(dictionaryInfo.uncompressedFilename) && downloadable != null) {
+      final Intent intent = getDownloadIntent(downloadable);
+      startActivity(intent);
+    } else {
+      final Intent intent = DictionaryActivity.getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename), 0, "");
+      startActivity(intent);
+    }
+  }
+  
   class Adapter extends BaseAdapter {
     
-    final List<DictionaryInfo> dictionaryInfos = application.getAllDictionaries();
+    final List<DictionaryInfo> dictionaryInfos = new ArrayList<DictionaryInfo>();
+    
+    Adapter() {
+      final String filter = filterText.getText().toString().trim().toLowerCase();
+      for (final DictionaryInfo dictionaryInfo : application.getAllDictionaries()) {
+        boolean canShow = true;
+        if (showLocal.isChecked() && !application.isDictionaryOnDevice(dictionaryInfo.uncompressedFilename)) {
+          canShow = false;
+        }
+        if (canShow && filter.length() > 0) {
+          if (!application.getDictionaryName(dictionaryInfo.uncompressedFilename).toLowerCase().contains(filter)) {
+            canShow = false;
+          }
+        }
+        if (canShow) {
+          dictionaryInfos.add(dictionaryInfo);
+        }
+      }
+    }
 
     @Override
     public int getCount() {
@@ -214,57 +314,42 @@ public class DictionaryManagerActivity extends ListActivity {
     }
     
     @Override
-    public View getView(final int position, final View convertView, final ViewGroup parent) {
+    public View getView(final int position, View convertView, final ViewGroup parent) {
+       if (convertView == null) {
+           convertView = LayoutInflater.from(parent.getContext()).inflate(
+                   R.layout.dictionary_manager_row, parent, false);
+       }
+        
       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 TextView textView = (TextView) convertView.findViewById(R.id.dictionaryName);
       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 Button downloadButton = (Button) convertView.findViewById(R.id.dictionaryDownloadButton);
       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, downloadable.zipBytes / 1024.0 / 1024.0));
-        downloadButton.setOnClickListener(new IntentLauncher(parent.getContext(), DownloadActivity
-            .getLaunchIntent(downloadable.downloadUrl,
-                application.getPath(dictionaryInfo.uncompressedFilename).getPath() + ".zip",
-                dictionaryInfo.dictInfo)) {
-          @Override
-          protected void onGo() {
-            application.invalidateDictionaryInfo(dictionaryInfo.uncompressedFilename);
-          }
-        });
-        WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
-        layoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
-        layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        downloadButton.setLayoutParams(layoutParams);
-        row.addView(downloadButton);
+      final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
+      if (updateAvailable) {
+          downloadButton.setCompoundDrawablesWithIntrinsicBounds(
+                              android.R.drawable.ic_menu_add, 
+                          0, 0, 0);
+          downloadButton.setText(getString(R.string.downloadButton, downloadable.zipBytes / 1024.0 / 1024.0));
+      } else if (!application.isDictionaryOnDevice(dictionaryInfo.uncompressedFilename)) {
+          downloadButton.setCompoundDrawablesWithIntrinsicBounds(
+                  android.R.drawable.ic_menu_add, 
+              0, 0, 0);
+          downloadButton.setText(getString(R.string.downloadButton, downloadable.zipBytes / 1024.0 / 1024.0));
       } else {
-        final ImageView checkMark = new ImageView(parent.getContext());
-        checkMark.setImageResource(R.drawable.btn_check_buttonless_on);
-        row.addView(checkMark);
+          downloadButton.setCompoundDrawablesWithIntrinsicBounds(
+                  android.R.drawable.checkbox_on_background, 
+              0, 0, 0);
+          downloadButton.setText("");
       }
+      final Intent intent = getDownloadIntent(downloadable);
+      downloadButton.setOnClickListener(new IntentLauncher(parent.getContext(), intent));
 
       // 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 TextView dictionaryDetails = (TextView) convertView.findViewById(R.id.dictionaryDetails);
       final StringBuilder builder = new StringBuilder();
       for (final IndexInfo indexInfo : dictionaryInfo.indexInfos) {
         if (builder.length() > 0) {
@@ -272,26 +357,23 @@ public class DictionaryManagerActivity extends ListActivity {
         }
         builder.append(getString(R.string.indexInfo, indexInfo.shortName, indexInfo.mainTokenCount));
       }
-      final TextView indexView = new TextView(parent.getContext());
-      indexView.setText(builder.toString());
-      row2.addView(indexView);
+      dictionaryDetails.setText(builder.toString());
       
-      
-      // 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(true);
-      result.setLongClickable(true);
-      result.setBackgroundResource(android.R.drawable.menuitem_background);
-      result.setOnClickListener(new TextView.OnClickListener() {
+//      // Because we have a Button inside a ListView row:
+//      // http://groups.google.com/group/android-developers/browse_thread/thread/3d96af1530a7d62a?pli=1
+      //convertView.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
+      convertView.setClickable(true);
+      convertView.setFocusable(true);
+      convertView.setLongClickable(true);
+//      result.setBackgroundResource(android.R.drawable.menuitem_background);
+      convertView.setOnClickListener(new TextView.OnClickListener() {
         @Override
         public void onClick(View v) {
           DictionaryManagerActivity.this.onClick(position);
         }
       });
-
-      return result;
+      
+      return convertView;
     }
   }