]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryManagerActivity.java
Long-press on lang button shows list.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryManagerActivity.java
index b1d2398f3af8ccdf587b64580a98df50674131ce..73b8b40b4912f7dab5b93801ae27263f537a7971 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.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -27,35 +27,38 @@ import android.preference.PreferenceManager;
 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.View;
 import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.WindowManager;
 import android.webkit.WebView;
 import android.widget.AdapterView;
-import android.widget.BaseAdapter;
-import android.widget.TableLayout;
-import android.widget.TextView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 
-import com.hughes.android.util.PersistentObjectCache;
+import com.hughes.android.util.IntentLauncher;
+import com.hughes.util.StringUtil;
 
 public class DictionaryManagerActivity extends ListActivity {
 
   static final String LOG = "QuickDic";
-  
-  QuickDicConfig quickDicConfig = new QuickDicConfig();
-  
+  static boolean canAutoLaunch = true;
+
+  DictionaryApplication application;
+  Adapter adapter;
   
   public void onCreate(Bundle savedInstanceState) {
-    ((DictionaryApplication)getApplication()).applyTheme(this);
-
     super.onCreate(savedInstanceState);
     Log.d(LOG, "onCreate:" + this);
+    
+    application = (DictionaryApplication) getApplication();
 
     // UI init.
     setContentView(R.layout.list_activity);
@@ -67,6 +70,8 @@ public class DictionaryManagerActivity extends ListActivity {
         onClick(index);
       }
     });
+    
+    getListView().setClickable(true);
 
     // ContextMenu.
     registerForContextMenu(getListView());
@@ -74,10 +79,11 @@ public class DictionaryManagerActivity extends ListActivity {
     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(getString(R.string.thanksForUpdating), "text/html", "utf-8");
+      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) {
@@ -93,11 +99,25 @@ public class DictionaryManagerActivity extends ListActivity {
       alert.getWindow().setAttributes(layoutParams);
       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 dictIndex) {
-    final Intent intent = DictionaryActivity.getIntent(this, dictIndex, 0, "");
-    startActivity(intent);
+  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
@@ -111,67 +131,19 @@ public class DictionaryManagerActivity extends ListActivity {
     }
     
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-    if (prefs.contains(C.DICT_INDEX) && prefs.contains(C.INDEX_INDEX)) {
+    if (canAutoLaunch && prefs.contains(C.DICT_FILE) && prefs.contains(C.INDEX_INDEX)) {
+      canAutoLaunch = false;  // Only autolaunch once per-process, on startup.
       Log.d(LOG, "Skipping Dictionary List, going straight to dictionary.");
-      startActivity(DictionaryActivity.getIntent(this, prefs.getInt(C.DICT_INDEX, 0), prefs.getInt(C.INDEX_INDEX, 0), prefs.getString(C.SEARCH_TOKEN, "")));
+      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();
       return;
     }
 
-    quickDicConfig = PersistentObjectCache.init(this).read(C.DICTIONARY_CONFIGS, QuickDicConfig.class);
-    if (quickDicConfig == null) {
-      quickDicConfig = new QuickDicConfig();
-      PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, quickDicConfig);
-    }
-    if (quickDicConfig.currentVersion < QuickDicConfig.LATEST_VERSION) {
-      Log.d(LOG, "Dictionary list is old, updating it.");
-      
-      // Replace <-> with -
-      if (quickDicConfig.currentVersion < 5) {
-        for (final DictionaryInfo config : quickDicConfig.dictionaryConfigs) {
-          config.name = config.name.replace("<->", "-");
-        }
-      }
-      quickDicConfig.addDefaultDictionaries();
-      quickDicConfig.currentVersion = QuickDicConfig.LATEST_VERSION;
-      PersistentObjectCache.init(this).write(C.DICTIONARY_CONFIGS, quickDicConfig);
-    }
-    
-    Log.d(LOG, "DictionaryList: " + quickDicConfig.dictionaryConfigs);
-
-    setListAdapter(new Adapter());
+    setListAdapter(adapter = new Adapter());
   }
 
   public boolean onCreateOptionsMenu(final Menu menu) {
-    final MenuItem newDictionaryMenuItem = menu.add(R.string.addDictionary);
-    newDictionaryMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-          public boolean onMenuItemClick(final MenuItem menuItem) {
-            final DictionaryInfo dictionaryConfig = new DictionaryInfo();
-            dictionaryConfig.name = getString(R.string.newDictionary);
-            quickDicConfig.dictionaryConfigs.add(0, dictionaryConfig);
-            dictionaryConfigsChanged();
-            return false;
-          }
-        });
-
-    final MenuItem addDefaultDictionariesMenuItem = menu.add(R.string.addDefaultDictionaries);
-    addDefaultDictionariesMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-          public boolean onMenuItemClick(final MenuItem menuItem) {
-            quickDicConfig.addDefaultDictionaries();
-            dictionaryConfigsChanged();
-            return false;
-          }
-        });
-
-    final MenuItem removeAllDictionariesMenuItem = menu.add(R.string.removeAllDictionaries);
-    removeAllDictionariesMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-          public boolean onMenuItemClick(final MenuItem menuItem) {
-            quickDicConfig.dictionaryConfigs.clear();
-            dictionaryConfigsChanged();
-            return false;
-          }
-        });
-
     final MenuItem about = menu.add(getString(R.string.about));
     about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       public boolean onMenuItemClick(final MenuItem menuItem) {
@@ -202,24 +174,16 @@ public class DictionaryManagerActivity extends ListActivity {
     super.onCreateContextMenu(menu, view, menuInfo);
     
     final AdapterContextMenuInfo adapterContextMenuInfo = (AdapterContextMenuInfo) menuInfo;
+    final int position = adapterContextMenuInfo.position;
+    final DictionaryInfo dictionaryInfo = adapter.getItem(position);
     
-    final MenuItem editMenuItem = menu.add(R.string.editDictionary);
-    editMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-      @Override
-      public boolean onMenuItemClick(MenuItem item) {
-        startActivity(DictionaryEditActivity.getIntent(adapterContextMenuInfo.position));
-        return true;
-      }
-    });
-
-    if (adapterContextMenuInfo.position > 0) {
+    if (position > 0) {
       final MenuItem moveToTopMenuItem = menu.add(R.string.moveToTop);
       moveToTopMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
         @Override
         public boolean onMenuItemClick(MenuItem item) {
-          final DictionaryInfo dictionaryConfig = quickDicConfig.dictionaryConfigs.remove(adapterContextMenuInfo.position);
-          quickDicConfig.dictionaryConfigs.add(0, dictionaryConfig);
-          dictionaryConfigsChanged();
+          application.moveDictionaryToTop(dictionaryInfo);
+          setListAdapter(adapter = new Adapter());
           return true;
         }
       });
@@ -229,29 +193,26 @@ public class DictionaryManagerActivity extends ListActivity {
     deleteMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       @Override
       public boolean onMenuItemClick(MenuItem item) {
-        quickDicConfig.dictionaryConfigs.remove(adapterContextMenuInfo.position);
-        dictionaryConfigsChanged();
+        application.deleteDictionary(dictionaryInfo);
+        setListAdapter(adapter = new Adapter());
         return true;
       }
     });
 
   }
 
-  private void dictionaryConfigsChanged() {
-    PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, quickDicConfig);
-    setListAdapter(getListAdapter());
-  }
-
   class Adapter extends BaseAdapter {
+    
+    final List<DictionaryInfo> dictionaryInfos = application.getAllDictionaries();
 
     @Override
     public int getCount() {
-      return quickDicConfig.dictionaryConfigs.size();
+      return dictionaryInfos.size();
     }
 
     @Override
     public DictionaryInfo getItem(int position) {
-      return quickDicConfig.dictionaryConfigs.get(position);
+      return dictionaryInfos.get(position);
     }
 
     @Override
@@ -260,30 +221,60 @@ public class DictionaryManagerActivity extends ListActivity {
     }
     
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-      final DictionaryInfo dictionaryConfig = getItem(position);
-      final TableLayout tableLayout = new TableLayout(parent.getContext());
-      final TextView view = new TextView(parent.getContext());
+    public View getView(final int position, final View convertView, final ViewGroup parent) {
+      final DictionaryInfo dictionaryInfo = getItem(position);
+      final LinearLayout result = new LinearLayout(parent.getContext());
       
-      String name = dictionaryConfig.name;
-      if (!new File(dictionaryConfig.localFile).canRead()) {
-        name = getString(R.string.notOnDevice, dictionaryConfig.name);
+      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.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);
+        result.addView(downloadButton);
       }
 
-      view.setText(name);
-      view.setTextSize(TypedValue.COMPLEX_UNIT_SP, 22);
-      tableLayout.addView(view);
+      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);
+
+      // 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() {
+        @Override
+        public void onClick(View v) {
+          DictionaryManagerActivity.this.onClick(position);
+        }
+      });
 
-      return tableLayout;
+      return result;
     }
-    
   }
 
-  public static Intent getIntent(final Context context) {
-    DictionaryActivity.clearDictionaryPrefs(context);
+  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;
   }