Display uncompressed size of dictionaries.

[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 30a4e3b9fec4d9bc211c4bcc1441adc824003138..bd9f364a1739bd039e2f9e3b65a1bb45c0820ab2 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -29,11 +29,16 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
+import android.support.v7.widget.SearchView.OnQueryTextListener;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -45,15 +50,12 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.ListAdapter;
+import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockListActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.widget.SearchView;
-import com.actionbarsherlock.widget.SearchView.OnQueryTextListener;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.util.IntentLauncher;
 
@@ -72,11 +74,25 @@ import java.util.zip.ZipFile;
 // Right-click:
 //  Delete, move to top.
 
-public class DictionaryManagerActivity extends SherlockListActivity {
+public class DictionaryManagerActivity extends ActionBarActivity {
 
     static final String LOG = "QuickDic";
     static boolean blockAutoLaunch = false;
 
+    private ListView listView;
+    private ListView getListView() {
+        if (listView == null) {
+            listView = (ListView)findViewById(android.R.id.list);
+        }
+        return listView;
+    }
+    private void setListAdapter(ListAdapter adapter) {
+        getListView().setAdapter(adapter);
+    }
+    private ListAdapter getListAdapter() {
+        return getListView().getAdapter();
+    }
+
     DictionaryApplication application;
 
     SearchView filterSearchView;
@@ -96,7 +112,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
             uiHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    setListAdapater();
+                    setMyListAdapater();
                 }
             });
         }
@@ -130,8 +146,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                             "Download failed: status=" + status +
                                     ", reason=" + cursor.getString(cursor
                                             .getColumnIndex(DownloadManager.COLUMN_REASON)));
-                    Toast.makeText(context, getString(R.string.downloadFailed, dest),
-                            Toast.LENGTH_LONG).show();
+                    new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(getString(R.string.downloadFailed, dest)).setNeutralButton("Close", null).show();
                     return;
                 }
 
@@ -148,7 +163,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                     final InputStream zipIn = zipFile.getInputStream(zipEntry);
                     File targetFile = new File(application.getDictDir(), zipEntry.getName());
                     if (targetFile.exists()) {
-                        targetFile.renameTo(new File(targetFile.getAbsolutePath().replace(".quickdic", "bak.quickdic")));
+                        targetFile.renameTo(new File(targetFile.getAbsolutePath().replace(".quickdic", ".bak.quickdic")));
                         targetFile = new File(application.getDictDir(), zipEntry.getName());
                     }
                     final OutputStream zipOut = new FileOutputStream(targetFile);
@@ -158,8 +173,12 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                     Toast.makeText(context, getString(R.string.installationFinished, dest),
                             Toast.LENGTH_LONG).show();
                 } catch (Exception e) {
-                    Toast.makeText(context, getString(R.string.unzippingFailed, dest),
-                            Toast.LENGTH_LONG).show();
+                    String msg = getString(R.string.unzippingFailed, dest);
+                    File dir = application.getDictDir();
+                    if (!dir.canWrite() || !application.checkFileCreate(dir)) {
+                        msg = getString(R.string.notWritable, dir.getAbsolutePath());
+                    }
+                    new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(msg).setNeutralButton("Close", null).show();
                     Log.e(LOG, "Failed to unzip.", e);
                 } finally {
                     localZipFile.delete();
@@ -168,16 +187,16 @@ public class DictionaryManagerActivity extends SherlockListActivity {
         }
     };
 
-    public static Intent getLaunchIntent() {
-        final Intent intent = new Intent();
-        intent.setClassName(DictionaryManagerActivity.class.getPackage().getName(),
-                DictionaryManagerActivity.class.getName());
+    public static Intent getLaunchIntent(Context c) {
+        final Intent intent = new Intent(c, DictionaryManagerActivity.class);
         intent.putExtra(C.CAN_AUTO_LAUNCH_DICT, false);
         return intent;
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        // This must be first, otherwise the actiona bar doesn't get
+        // styled properly.
         setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
 
         super.onCreate(savedInstanceState);
@@ -203,7 +222,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
         showDownloadable.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                onShowLocalChanged();
+                onShowDownloadableChanged();
             }
         });
 
@@ -212,7 +231,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
         if (!prefs.getString(C.THANKS_FOR_UPDATING_VERSION, "").equals(
                 thanksForUpdatingLatestVersion)) {
             blockAutoLaunch = true;
-            startActivity(HtmlDisplayActivity.getWhatsNewLaunchIntent());
+            startActivity(HtmlDisplayActivity.getWhatsNewLaunchIntent(getApplicationContext()));
             prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion)
                     .commit();
         }
@@ -220,7 +239,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
         registerReceiver(broadcastReceiver, new IntentFilter(
                 DownloadManager.ACTION_DOWNLOAD_COMPLETE));
 
-        setListAdapater();
+        setMyListAdapater();
         registerForContextMenu(getListView());
 
         final File dictDir = application.getDictDir();
@@ -233,6 +252,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                     R.string.unableToReadDictionaryDir,
                     dictDir.getAbsolutePath(),
                     Environment.getExternalStorageDirectory()));
+            builder.setNeutralButton("Close", null);
             builder.create().show();
         }
 
@@ -272,7 +292,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
 
             @Override
             public boolean onQueryTextChange(String filterText) {
-                setListAdapater();
+                setMyListAdapater();
                 return true;
             }
         });
@@ -323,14 +343,14 @@ public class DictionaryManagerActivity extends SherlockListActivity {
         }
 
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        showDownloadable.setChecked(prefs.getBoolean(C.SHOW_DOWNLOADABLE, false));
+        showDownloadable.setChecked(prefs.getBoolean(C.SHOW_DOWNLOADABLE, true));
 
         if (!blockAutoLaunch &&
                 getIntent().getBooleanExtra(C.CAN_AUTO_LAUNCH_DICT, true) &&
                 prefs.contains(C.DICT_FILE) &&
                 prefs.contains(C.INDEX_SHORT_NAME)) {
             Log.d(LOG, "Skipping DictionaryManager, going straight to dictionary.");
-            startActivity(DictionaryActivity.getLaunchIntent(
+            startActivity(DictionaryActivity.getLaunchIntent(getApplicationContext(),
                     new File(prefs.getString(C.DICT_FILE, "")),
                     prefs.getString(C.INDEX_SHORT_NAME, ""),
                     prefs.getString(C.SEARCH_TOKEN, "")));
@@ -348,7 +368,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
 
         application.backgroundUpdateDictionaries(dictionaryUpdater);
 
-        setListAdapater();
+        setMyListAdapater();
     }
 
     @Override
@@ -380,7 +400,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                         @Override
                         public boolean onMenuItemClick(android.view.MenuItem item) {
                             application.moveDictionaryToTop(row.dictionaryInfo);
-                            setListAdapater();
+                            setMyListAdapater();
                             return true;
                         }
                     });
@@ -393,15 +413,15 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                         @Override
                         public boolean onMenuItemClick(android.view.MenuItem item) {
                             application.deleteDictionary(row.dictionaryInfo);
-                            setListAdapater();
+                            setMyListAdapater();
                             return true;
                         }
                     });
         }
     }
 
-    private void onShowLocalChanged() {
-        setListAdapater();
+    private void onShowDownloadableChanged() {
+        setMyListAdapater();
         Editor prefs = PreferenceManager.getDefaultSharedPreferences(this).edit();
         prefs.putBoolean(C.SHOW_DOWNLOADABLE, showDownloadable.isChecked());
         prefs.commit();
@@ -491,7 +511,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
 
     }
 
-    private void setListAdapater() {
+    private void setMyListAdapater() {
         final String filter = filterSearchView == null ? "" : filterSearchView.getQuery()
                 .toString();
         final String[] filters = filter.trim().toLowerCase().split("(\\s|-)+");
@@ -509,16 +529,17 @@ public class DictionaryManagerActivity extends SherlockListActivity {
 
         final boolean updateAvailable = application.updateAvailable(dictionaryInfo);
         final Button downloadButton = (Button) row.findViewById(R.id.downloadButton);
+        final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
         if (!canLaunch || updateAvailable) {
             downloadButton
                     .setText(getString(
                             R.string.downloadButton,
-                            application.getDownloadable(dictionaryInfo.uncompressedFilename).zipBytes / 1024.0 / 1024.0));
+                            downloadable.zipBytes / 1024.0 / 1024.0));
             downloadButton.setMinWidth(application.languageButtonPixels * 3 / 2);
             downloadButton.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View arg0) {
-                    downloadDictionary(dictionaryInfo);
+                    downloadDictionary(downloadable.downloadUrl);
                 }
             });
         } else {
@@ -530,7 +551,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                 .sortedIndexInfos(dictionaryInfo.indexInfos);
         final StringBuilder builder = new StringBuilder();
         if (updateAvailable) {
-            builder.append(getString(R.string.updateButton));
+            builder.append(getString(R.string.updateAvailable));
         }
         for (IndexInfo indexInfo : sortedIndexInfos) {
             final View button = application.createButton(buttons.getContext(), dictionaryInfo,
@@ -540,7 +561,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
             if (canLaunch) {
                 button.setOnClickListener(
                         new IntentLauncher(buttons.getContext(),
-                                DictionaryActivity.getLaunchIntent(
+                                DictionaryActivity.getLaunchIntent(getApplicationContext(),
                                         application.getPath(dictionaryInfo.uncompressedFilename),
                                         indexInfo.shortName, "")));
 
@@ -553,12 +574,14 @@ public class DictionaryManagerActivity extends SherlockListActivity {
             builder.append(getString(R.string.indexInfo, indexInfo.shortName,
                     indexInfo.mainTokenCount));
         }
+        builder.append("; ");
+        builder.append(getString(R.string.downloadButton, downloadable.uncompressedBytes / 1024.0 / 1024.0));
         details.setText(builder.toString());
 
         if (canLaunch) {
             row.setClickable(true);
             row.setOnClickListener(new IntentLauncher(parent.getContext(),
-                    DictionaryActivity.getLaunchIntent(
+                    DictionaryActivity.getLaunchIntent(getApplicationContext(),
                             application.getPath(dictionaryInfo.uncompressedFilename),
                             dictionaryInfo.indexInfos.get(0).shortName, "")));
             row.setFocusable(true);
@@ -569,12 +592,12 @@ public class DictionaryManagerActivity extends SherlockListActivity {
         return row;
     }
 
-    private void downloadDictionary(final DictionaryInfo dictionaryInfo) {
+    private void downloadDictionary(final String downloadUrl) {
         DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
         Request request = new Request(
-                Uri.parse(dictionaryInfo.downloadUrl));
+                Uri.parse(downloadUrl));
         try {
-            final String destFile = new File(new URL(dictionaryInfo.downloadUrl).getFile())
+            final String destFile = new File(new URL(downloadUrl).getFile())
                     .getName();
             Log.d(LOG, "Downloading to: " + destFile);