]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryManagerActivity.java
More flags, french translations.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryManagerActivity.java
index e3e76ad72a3c2f3b6944f0603a11f55c1813580e..1649144492e768c5a756ca97465053ce59c90bf0 100644 (file)
@@ -15,7 +15,6 @@
 package com.hughes.android.dictionary;
 
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.DownloadManager;
 import android.app.DownloadManager.Request;
 import android.content.BroadcastReceiver;
@@ -31,26 +30,28 @@ import android.os.Environment;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.CompoundButton;
-import android.widget.ListView;
-import android.widget.Toast;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 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.view.MenuInflater;
 import com.actionbarsherlock.widget.SearchView;
 import com.actionbarsherlock.widget.SearchView.OnQueryTextListener;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
@@ -85,7 +86,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
     LinearLayout downloadableDictionariesHeaderRow;
 
     Handler uiHandler;
-    
+
     Runnable dictionaryUpdater = new Runnable() {
         @Override
         public void run() {
@@ -95,12 +96,12 @@ public class DictionaryManagerActivity extends SherlockListActivity {
             uiHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    setListAdapater();
+                    setMyListAdapater();
                 }
             });
         }
     };
-    
+
     final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -135,22 +136,29 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                 }
 
                 Log.w(LOG, "Download finished: " + dest);
+                Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
+                        Toast.LENGTH_LONG).show();
+                
+                
                 final File localZipFile = new File(Uri.parse(dest).getPath());
-
                 try {
                     ZipFile zipFile = new ZipFile(localZipFile);
                     final ZipEntry zipEntry = zipFile.entries().nextElement();
                     Log.d(LOG, "Unzipping entry: " + zipEntry.getName());
                     final InputStream zipIn = zipFile.getInputStream(zipEntry);
-                    final OutputStream zipOut = new FileOutputStream(
-                            new File(application.getDictDir(), zipEntry.getName()));
+                    File targetFile = new File(application.getDictDir(), zipEntry.getName());
+                    if (targetFile.exists()) {
+                        targetFile.renameTo(new File(targetFile.getAbsolutePath().replace(".quickdic", ".bak.quickdic")));
+                        targetFile = new File(application.getDictDir(), zipEntry.getName());
+                    }
+                    final OutputStream zipOut = new FileOutputStream(targetFile);
                     copyStream(zipIn, zipOut);
                     zipFile.close();
                     application.backgroundUpdateDictionaries(dictionaryUpdater);
-                    Toast.makeText(context, getString(R.string.downloadFinished, dest),
+                    Toast.makeText(context, getString(R.string.installationFinished, dest),
                             Toast.LENGTH_LONG).show();
                 } catch (Exception e) {
-                    Toast.makeText(context, getString(R.string.downloadFailed, dest),
+                    Toast.makeText(context, getString(R.string.unzippingFailed, dest),
                             Toast.LENGTH_LONG).show();
                     Log.e(LOG, "Failed to unzip.", e);
                 } finally {
@@ -170,29 +178,34 @@ public class DictionaryManagerActivity extends SherlockListActivity {
 
     @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);
         Log.d(LOG, "onCreate:" + this);
 
         application = (DictionaryApplication) getApplication();
-        
+
         blockAutoLaunch = false;
-        
+
         // UI init.
         setContentView(R.layout.dictionary_manager_activity);
 
-        dictionariesOnDeviceHeaderRow = (LinearLayout) LayoutInflater.from(getListView().getContext()).inflate(
+        dictionariesOnDeviceHeaderRow = (LinearLayout) LayoutInflater.from(
+                getListView().getContext()).inflate(
                 R.layout.dictionary_manager_header_row_on_device, getListView(), false);
 
-        downloadableDictionariesHeaderRow = (LinearLayout) LayoutInflater.from(getListView().getContext()).inflate(
+        downloadableDictionariesHeaderRow = (LinearLayout) LayoutInflater.from(
+                getListView().getContext()).inflate(
                 R.layout.dictionary_manager_header_row_downloadable, getListView(), false);
 
-        showDownloadable = (ToggleButton) downloadableDictionariesHeaderRow.findViewById(R.id.hideDownloadable);
+        showDownloadable = (ToggleButton) downloadableDictionariesHeaderRow
+                .findViewById(R.id.hideDownloadable);
         showDownloadable.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                onShowLocalChanged();
+                onShowDownloadableChanged();
             }
         });
 
@@ -205,34 +218,78 @@ public class DictionaryManagerActivity extends SherlockListActivity {
             prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion)
                     .commit();
         }
-        
-         
+
         registerReceiver(broadcastReceiver, new IntentFilter(
                 DownloadManager.ACTION_DOWNLOAD_COMPLETE));
-        
-        setListAdapater();
+
+        setMyListAdapater();
         registerForContextMenu(getListView());
-        
+
         final File dictDir = application.getDictDir();
         if (!dictDir.canRead() || !dictDir.canExecute()) {
             blockAutoLaunch = true;
-            
+
             AlertDialog.Builder builder = new AlertDialog.Builder(getListView().getContext());
             builder.setTitle(getString(R.string.error));
             builder.setMessage(getString(
-                    R.string.unableToReadDictionaryDir, 
-                    dictDir.getAbsolutePath(), 
+                    R.string.unableToReadDictionaryDir,
+                    dictDir.getAbsolutePath(),
                     Environment.getExternalStorageDirectory()));
             builder.create().show();
         }
+
+        onCreateSetupActionBar();
+    }
+
+    private void onCreateSetupActionBar() {
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayShowTitleEnabled(false);
+
+        filterSearchView = new SearchView(getSupportActionBar().getThemedContext());
+        filterSearchView.setIconifiedByDefault(false);
+        // filterSearchView.setIconified(false); // puts the magnifying glass in
+        // the
+        // wrong place.
+        filterSearchView.setQueryHint(getString(R.string.searchText));
+        filterSearchView.setSubmitButtonEnabled(false);
+        final int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 300,
+                getResources().getDisplayMetrics());
+        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(width,
+                FrameLayout.LayoutParams.WRAP_CONTENT);
+        filterSearchView.setLayoutParams(lp);
+        filterSearchView.setImeOptions(
+                EditorInfo.IME_ACTION_SEARCH |
+                        EditorInfo.IME_FLAG_NO_EXTRACT_UI |
+                        EditorInfo.IME_FLAG_NO_ENTER_ACTION |
+                        // EditorInfo.IME_FLAG_NO_FULLSCREEN | // Requires API
+                        // 11
+                        EditorInfo.IME_MASK_ACTION |
+                        EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+
+        filterSearchView.setOnQueryTextListener(new OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String filterText) {
+                setMyListAdapater();
+                return true;
+            }
+        });
+        filterSearchView.setFocusable(true);
+
+        actionBar.setCustomView(filterSearchView);
+        actionBar.setDisplayShowCustomEnabled(true);
     }
-    
+
     @Override
     public void onDestroy() {
         super.onDestroy();
         unregisterReceiver(broadcastReceiver);
     }
-    
+
     private static int copyStream(final InputStream in, final OutputStream out)
             throws IOException {
         int bytesRead;
@@ -268,7 +325,7 @@ 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) &&
@@ -276,12 +333,13 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                 prefs.contains(C.INDEX_SHORT_NAME)) {
             Log.d(LOG, "Skipping DictionaryManager, going straight to dictionary.");
             startActivity(DictionaryActivity.getLaunchIntent(
-                    new File(prefs.getString(C.DICT_FILE, "")), prefs.getString(C.INDEX_SHORT_NAME, ""),
+                    new File(prefs.getString(C.DICT_FILE, "")),
+                    prefs.getString(C.INDEX_SHORT_NAME, ""),
                     prefs.getString(C.SEARCH_TOKEN, "")));
             finish();
             return;
         }
-        
+
         // Remove the active dictionary from the prefs so we won't autolaunch
         // next time.
         final Editor editor = prefs.edit();
@@ -292,29 +350,11 @@ public class DictionaryManagerActivity extends SherlockListActivity {
 
         application.backgroundUpdateDictionaries(dictionaryUpdater);
 
-        setListAdapater();
+        setMyListAdapater();
     }
 
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
-        MenuInflater inflater = getSupportMenuInflater();
-        inflater.inflate(R.menu.dictionary_manager_options_menu, menu);
-        
-        filterSearchView = (SearchView) menu.findItem(R.id.filterText).getActionView();
-        filterSearchView.setOnQueryTextListener(new OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                return true;
-            }
-            
-            @Override
-            public boolean onQueryTextChange(String filterText) {
-                setListAdapater();
-                return true;
-            }
-        });
-        filterSearchView.setIconifiedByDefault(false);
-
         application.onCreateGlobalOptionsMenu(this, menu);
         return true;
     }
@@ -329,7 +369,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                 (AdapterContextMenuInfo) menuInfo;
         final int position = adapterContextMenuInfo.position;
         final MyListAdapter.Row row = (MyListAdapter.Row) getListAdapter().getItem(position);
-        
+
         if (row.dictionaryInfo == null) {
             return;
         }
@@ -342,7 +382,7 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                         @Override
                         public boolean onMenuItemClick(android.view.MenuItem item) {
                             application.moveDictionaryToTop(row.dictionaryInfo);
-                            setListAdapater();
+                            setMyListAdapater();
                             return true;
                         }
                     });
@@ -355,54 +395,35 @@ 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();
     }
 
-    // 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 MyListAdapter extends BaseAdapter {
 
         List<DictionaryInfo> dictionariesOnDevice;
         List<DictionaryInfo> downloadableDictionaries;
-        
+
         class Row {
             DictionaryInfo dictionaryInfo;
             boolean onDevice;
-            
+
             private Row(DictionaryInfo dictinoaryInfo, boolean onDevice) {
                 this.dictionaryInfo = dictinoaryInfo;
                 this.onDevice = onDevice;
             }
         }
 
-        
         private MyListAdapter(final String[] filters) {
             dictionariesOnDevice = application.getDictionariesOnDevice(filters);
             if (showDownloadable.isChecked()) {
@@ -423,17 +444,17 @@ public class DictionaryManagerActivity extends SherlockListActivity {
                 return new Row(null, true);
             }
             position -= 1;
-            
+
             if (position < dictionariesOnDevice.size()) {
                 return new Row(dictionariesOnDevice.get(position), true);
             }
             position -= dictionariesOnDevice.size();
-            
+
             if (position == 0) {
                 return new Row(null, false);
             }
             position -= 1;
-            
+
             assert position < downloadableDictionaries.size();
             return new Row(downloadableDictionaries.get(position), false);
         }
@@ -445,40 +466,43 @@ public class DictionaryManagerActivity extends SherlockListActivity {
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            if (convertView instanceof LinearLayout && 
-                    convertView != dictionariesOnDeviceHeaderRow && 
+            if (convertView instanceof LinearLayout &&
+                    convertView != dictionariesOnDeviceHeaderRow &&
                     convertView != downloadableDictionariesHeaderRow) {
-                /* This is done to try to avoid leaking memory that used to 
-                 * happen on Android 4.0.3 */
-                ((LinearLayout)convertView).removeAllViews();
+                /*
+                 * This is done to try to avoid leaking memory that used to
+                 * happen on Android 4.0.3
+                 */
+                ((LinearLayout) convertView).removeAllViews();
             }
-            
+
             final Row row = getItem(position);
-            
+
             if (row.onDevice) {
                 if (row.dictionaryInfo == null) {
                     return dictionariesOnDeviceHeaderRow;
                 }
                 return createDictionaryRow(row.dictionaryInfo, parent, true);
             }
-            
+
             if (row.dictionaryInfo == null) {
                 return downloadableDictionariesHeaderRow;
             }
             return createDictionaryRow(row.dictionaryInfo, parent, false);
         }
-        
+
     }
-    
-    private void setListAdapater() {
-        final String filter = filterSearchView == null ? "" : filterSearchView.getQuery().toString();
+
+    private void setMyListAdapater() {
+        final String filter = filterSearchView == null ? "" : filterSearchView.getQuery()
+                .toString();
         final String[] filters = filter.trim().toLowerCase().split("(\\s|-)+");
         setListAdapter(new MyListAdapter(filters));
     }
 
-    private View createDictionaryRow(final DictionaryInfo dictionaryInfo, 
+    private View createDictionaryRow(final DictionaryInfo dictionaryInfo,
             final ViewGroup parent, final boolean canLaunch) {
-        
+
         View row = LayoutInflater.from(parent.getContext()).inflate(
                 R.layout.dictionary_manager_row, parent, false);
         final TextView name = (TextView) row.findViewById(R.id.dictionaryName);
@@ -488,12 +512,16 @@ public class DictionaryManagerActivity extends SherlockListActivity {
         final boolean updateAvailable = application.updateAvailable(dictionaryInfo);
         final Button downloadButton = (Button) row.findViewById(R.id.downloadButton);
         if (!canLaunch || updateAvailable) {
-            downloadButton.setText(getString(R.string.downloadButton, application.getDownloadable(dictionaryInfo.uncompressedFilename).zipBytes / 1024.0 / 1024.0));
+            final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
+            downloadButton
+                    .setText(getString(
+                            R.string.downloadButton,
+                            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 {
@@ -501,21 +529,23 @@ public class DictionaryManagerActivity extends SherlockListActivity {
         }
 
         LinearLayout buttons = (LinearLayout) row.findViewById(R.id.dictionaryLauncherButtons);
-        final List<IndexInfo> sortedIndexInfos = application.sortedIndexInfos(dictionaryInfo.indexInfos);
+        final List<IndexInfo> sortedIndexInfos = application
+                .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, indexInfo);
+            final View button = application.createButton(buttons.getContext(), dictionaryInfo,
+                    indexInfo);
             buttons.addView(button);
-            
+
             if (canLaunch) {
                 button.setOnClickListener(
-                        new IntentLauncher(buttons.getContext(), 
-                        DictionaryActivity.getLaunchIntent(
-                                application.getPath(dictionaryInfo.uncompressedFilename), 
-                                indexInfo.shortName, "")));
+                        new IntentLauncher(buttons.getContext(),
+                                DictionaryActivity.getLaunchIntent(
+                                        application.getPath(dictionaryInfo.uncompressedFilename),
+                                        indexInfo.shortName, "")));
 
             } else {
                 button.setEnabled(false);
@@ -523,27 +553,36 @@ public class DictionaryManagerActivity extends SherlockListActivity {
             if (builder.length() != 0) {
                 builder.append("; ");
             }
-            builder.append(getString(R.string.indexInfo, indexInfo.shortName, indexInfo.mainTokenCount));
+            builder.append(getString(R.string.indexInfo, indexInfo.shortName,
+                    indexInfo.mainTokenCount));
         }
         details.setText(builder.toString());
-        
-        row.setClickable(true);
-        row.setFocusable(true);
-        row.setLongClickable(true);
+
+        if (canLaunch) {
+            row.setClickable(true);
+            row.setOnClickListener(new IntentLauncher(parent.getContext(),
+                    DictionaryActivity.getLaunchIntent(
+                            application.getPath(dictionaryInfo.uncompressedFilename),
+                            dictionaryInfo.indexInfos.get(0).shortName, "")));
+            row.setFocusable(true);
+            row.setLongClickable(true);
+        }
         row.setBackgroundResource(android.R.drawable.menuitem_background);
-        
+
         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()).getName(); 
+            final String destFile = new File(new URL(downloadUrl).getFile())
+                    .getName();
             Log.d(LOG, "Downloading to: " + destFile);
-            
-            request.setDestinationUri(Uri.fromFile(new File(Environment.getExternalStorageDirectory(), destFile)));
+
+            request.setDestinationUri(Uri.fromFile(new File(Environment
+                    .getExternalStorageDirectory(), destFile)));
         } catch (MalformedURLException e) {
             throw new RuntimeException(e);
         }