Major refactor of down dictionary list is stored by app.

[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 ac1d97b47f8c61c862f0fc9015f056fbda395699..d5ac87eb18f16d07054bb9022f934b87520cb5c3 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -14,11 +14,10 @@
 
 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,29 +26,29 @@ 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.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.TableLayout;
 import android.widget.TextView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemClickListener;
-
-import com.hughes.android.util.PersistentObjectCache;
 
 public class DictionaryManagerActivity extends ListActivity {
 
   static final String LOG = "QuickDic";
-  
   QuickDicConfig quickDicConfig;
   
+  static boolean canAutoLaunch = true;
+  
+  final DictionaryApplication application = (DictionaryApplication) getApplication();
   
   public void onCreate(Bundle savedInstanceState) {
     //((DictionaryApplication)getApplication()).applyTheme(this);
@@ -74,6 +73,7 @@ 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());
@@ -93,10 +93,15 @@ 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, "");
+  private void onClick(int index) {
+    final DictionaryInfo dictionaryInfo = adapter.getItem(index);
+    final Intent intent = DictionaryActivity.getLaunchIntent(dictionaryInfo.uncompressedFilename, 0, "");
     startActivity(intent);
   }
   
@@ -111,23 +116,16 @@ 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(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(this);
-    } else {
-      quickDicConfig.addDefaultDictionaries(this);
-    }
-    PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, quickDicConfig);
-
-    Log.d(LOG, "DictionaryList: " + quickDicConfig.dictionaryInfos);
-    setListAdapter(new Adapter());
+    setListAdapter(adapter);
   }
 
   public boolean onCreateOptionsMenu(final Menu menu) {
@@ -161,24 +159,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.dictionaryInfos.remove(adapterContextMenuInfo.position);
-          quickDicConfig.dictionaryInfos.add(0, dictionaryConfig);
-          dictionaryConfigsChanged();
+          application.moveDictionaryToTop(dictionaryInfo.uncompressedFilename);
+          setListAdapter(adapter = new Adapter());
           return true;
         }
       });
@@ -188,29 +178,26 @@ public class DictionaryManagerActivity extends ListActivity {
     deleteMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       @Override
       public boolean onMenuItemClick(MenuItem item) {
-        quickDicConfig.dictionaryInfos.remove(adapterContextMenuInfo.position);
-        dictionaryConfigsChanged();
+        application.deleteDictionary(dictionaryInfo.uncompressedFilename);
+        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.dictionaryInfos.size();
+      return dictionaryInfos.size();
     }
 
     @Override
     public DictionaryInfo getItem(int position) {
-      return quickDicConfig.dictionaryInfos.get(position);
+      return dictionaryInfos.get(position);
     }
 
     @Override
@@ -220,13 +207,13 @@ public class DictionaryManagerActivity extends ListActivity {
     
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-      final DictionaryInfo dictionaryConfig = getItem(position);
+      final DictionaryInfo dictionaryInfo = getItem(position);
       final TableLayout tableLayout = new TableLayout(parent.getContext());
       final TextView view = new TextView(parent.getContext());
       
-      String name = dictionaryConfig.name;
-      if (!new File(dictionaryConfig.localFile).canRead()) {
-        name = getString(R.string.notOnDevice, dictionaryConfig.name);
+      String name = application.getDictionaryName(dictionaryInfo.uncompressedFilename);
+      if (!application.isDictionaryOnDevice(dictionaryInfo.uncompressedFilename)) {
+        name = getString(R.string.notOnDevice, name);
       }
 
       view.setText(name);
@@ -235,14 +222,14 @@ public class DictionaryManagerActivity extends ListActivity {
 
       return tableLayout;
     }
-    
   }
+  Adapter adapter = new Adapter();
 
-  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;
   }