]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryManagerActivity.java
Fix whats_new, add signed APK to git.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryManagerActivity.java
index 1ba06fc59fd7c845beb8a2fb645d5a4e5f3b2cd8..cc24e2245b5b4c4821e84ea28759196aa68617fa 100644 (file)
@@ -23,6 +23,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.util.TypedValue;
@@ -51,11 +52,15 @@ import com.hughes.util.StringUtil;
 public class DictionaryManagerActivity extends ListActivity {
 
   static final String LOG = "QuickDic";
-  static boolean canAutoLaunch = true;
+  static final long AUTO_LAUNCH_WAIT_MILLIS = 10 * 1000;
+  static long lastAutoLaunchMillis = -1;
+  static boolean blockAutoLaunch = false;
 
   DictionaryApplication application;
   Adapter adapter;
   
+  Handler uiHandler;
+  
   public static Intent getLaunchIntent() {
     final Intent intent = new Intent();
     intent.setClassName(DictionaryManagerActivity.class.getPackage().getName(),
@@ -65,6 +70,8 @@ public class DictionaryManagerActivity extends ListActivity {
   }
   
   public void onCreate(Bundle savedInstanceState) {
+    setTheme(((DictionaryApplication)getApplication()).getSelectedTheme().themeId);
+
     super.onCreate(savedInstanceState);
     Log.d(LOG, "onCreate:" + this);
     
@@ -86,10 +93,11 @@ 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;
+      blockAutoLaunch = true;
       final AlertDialog.Builder builder = new AlertDialog.Builder(this);
       builder.setCancelable(false);
       final WebView webView = new WebView(getApplicationContext());
@@ -109,20 +117,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;
-    }
   }
   
+  @Override
+  protected void onStart() {
+    super.onStart();
+    uiHandler = new Handler();
+  }
+  
+  @Override
+  protected void onStop() {
+    super.onStop();
+    uiHandler = null;
+  }
+
   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);
+      final Intent intent = getDownloadIntent(downloadable);
       startActivity(intent);
     } else {
       final Intent intent = DictionaryActivity.getLaunchIntent(application.getPath(dictionaryInfo.uncompressedFilename), 0, "");
@@ -140,15 +153,35 @@ public class DictionaryManagerActivity extends ListActivity {
       startActivity(getIntent());
     }
     
+    final long now = System.currentTimeMillis();
     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.
+    if (now - lastAutoLaunchMillis > AUTO_LAUNCH_WAIT_MILLIS &&
+        getIntent().getBooleanExtra(C.CAN_AUTO_LAUNCH_DICT, true) &&
+        prefs.contains(C.DICT_FILE) && 
+        prefs.contains(C.INDEX_INDEX) &&
+        !blockAutoLaunch) {
       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, "")));
+      lastAutoLaunchMillis = now;
       // Don't finish, so that user can hit back and get here.
       //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());
   }
@@ -168,7 +201,7 @@ public class DictionaryManagerActivity extends ListActivity {
     final int position = adapterContextMenuInfo.position;
     final DictionaryInfo dictionaryInfo = adapter.getItem(position);
     
-    if (position > 0) {
+    if (position > 0 && application.isDictionaryOnDevice(dictionaryInfo.uncompressedFilename)) {
       final MenuItem moveToTopMenuItem = menu.add(R.string.moveToTop);
       moveToTopMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
         @Override
@@ -190,6 +223,28 @@ public class DictionaryManagerActivity extends ListActivity {
       }
     });
 
+    final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
+    if (downloadable != null) {
+      final MenuItem downloadMenuItem = menu.add(getString(R.string.downloadButton, downloadable.zipBytes/1024.0/1024.0));
+      downloadMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+        @Override
+        public boolean onMenuItemClick(MenuItem item) {
+          final Intent intent = getDownloadIntent(downloadable);
+          startActivity(intent);
+          setListAdapter(adapter = new Adapter());
+          return true;
+        }
+
+      });
+    }
+
+  }
+
+  private Intent getDownloadIntent(final DictionaryInfo downloadable) {
+    final Intent intent = DownloadActivity.getLaunchIntent(downloadable.downloadUrl,
+        application.getPath(downloadable.uncompressedFilename).getPath() + ".zip",
+        downloadable.dictInfo);
+    return intent;
   }
 
   class Adapter extends BaseAdapter {
@@ -213,28 +268,40 @@ public class DictionaryManagerActivity extends ListActivity {
     
     @Override
     public View getView(final int position, final View convertView, final ViewGroup parent) {
+      final LinearLayout result;
+      // Android 4.0.3 leaks memory like crazy if we don't do this.
+      if (convertView instanceof LinearLayout) {
+        result = (LinearLayout) convertView;
+        result.removeAllViews();
+      } else {
+        result = new LinearLayout(parent.getContext());
+      }
+      
       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, 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);
-          }
-        });
+        final Intent intent = getDownloadIntent(downloadable);
+        downloadButton.setOnClickListener(new IntentLauncher(parent.getContext(), intent));
         WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
         layoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
         layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
@@ -242,16 +309,10 @@ public class DictionaryManagerActivity extends ListActivity {
         row.addView(downloadButton);
       } else {
         final ImageView checkMark = new ImageView(parent.getContext());
-        checkMark.setImageResource(android.R.drawable.checkbox_on_background);
+        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);
-      row.addView(textView);
-      
       // Add the information about each index.
       final LinearLayout row2 = new LinearLayout(parent.getContext());
       row2.setOrientation(LinearLayout.HORIZONTAL);
@@ -283,7 +344,7 @@ public class DictionaryManagerActivity extends ListActivity {
           DictionaryManagerActivity.this.onClick(position);
         }
       });
-
+      
       return result;
     }
   }