X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryManagerActivity.java;h=3ca7a6d9a8b1c6a5826fcb92fbb3c7f636a5049a;hb=83d497f704ad1f8ba85190255d46a3fbe0e3c353;hp=ca0c5e1dd7573c98466c0e3eda8be972af20befe;hpb=be6ef0a43f51df4ea0d0f1547e06a17ea0e90e2e;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index ca0c5e1..3ca7a6d 100644
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -60,6 +60,7 @@ import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
 import android.widget.ListView;
@@ -185,8 +186,9 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                 }
 
                 Log.w(LOG, "Download finished: " + dest + " Id: " + downloadId);
-                Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
-                               Toast.LENGTH_LONG).show();
+                if (!isFinishing())
+                    Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
+                                   Toast.LENGTH_LONG).show();
 
                 if (unzipInstall(context, Uri.parse(dest), dest, true)) {
                     finishedDownloadIds.add(downloadId);
@@ -232,13 +234,14 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             zipOut = new FileOutputStream(targetFile);
             copyStream(zipFile, zipOut);
             application.backgroundUpdateDictionaries(dictionaryUpdater);
-            Toast.makeText(context, getString(R.string.installationFinished, dest),
-                           Toast.LENGTH_LONG).show();
+            if (!isFinishing())
+                Toast.makeText(context, getString(R.string.installationFinished, dest),
+                               Toast.LENGTH_LONG).show();
             result = true;
         } catch (Exception e) {
             String msg = getString(R.string.unzippingFailed, dest + ": " + e.getMessage());
             File dir = application.getDictDir();
-            if (!dir.canWrite() || !application.checkFileCreate(dir)) {
+            if (!dir.canWrite() || !DictionaryApplication.checkFileCreate(dir)) {
                 msg = getString(R.string.notWritable, dir.getAbsolutePath());
             }
             new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(msg).setNeutralButton("Close", null).show();
@@ -323,7 +326,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                                                 getListView().getContext()).inflate(
                                                 R.layout.dictionary_manager_header_row_downloadable, getListView(), false);
 
-        showDownloadable = (ToggleButton) downloadableDictionariesHeaderRow
+        showDownloadable = downloadableDictionariesHeaderRow
                            .findViewById(R.id.hideDownloadable);
         showDownloadable.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
@@ -498,7 +501,19 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             }
         });
 
-        application.onCreateGlobalOptionsMenu(this, menu);
+        final MenuItem browserDownload = menu.add(getString(R.string.browserDownload));
+        MenuItemCompat.setShowAsAction(browserDownload, MenuItem.SHOW_AS_ACTION_NEVER);
+        browserDownload.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+            public boolean onMenuItemClick(final MenuItem menuItem) {
+                final Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri
+                               .parse("https://github.com/rdoeffinger/Dictionary/releases/v0.2-dictionaries"));
+                startActivity(intent);
+                return false;
+            }
+        });
+
+        DictionaryApplication.onCreateGlobalOptionsMenu(this, menu);
         return true;
     }
 
@@ -618,6 +633,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             if (row.dictionaryInfo == null) {
                 return row.onDevice ? 0 : 1;
             }
+            assert row.dictionaryInfo.indexInfos.size() <= 2;
             return 2;
         }
 
@@ -652,17 +668,13 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         if (row == null) {
             row = LayoutInflater.from(parent.getContext()).inflate(
                        R.layout.dictionary_manager_row, parent, false);
-        } else {
-            // TODO: avoid this
-            LinearLayout buttons = (LinearLayout) row.findViewById(R.id.dictionaryLauncherButtons);
-            buttons.removeAllViews();
         }
-        final TextView name = (TextView) row.findViewById(R.id.dictionaryName);
-        final TextView details = (TextView) row.findViewById(R.id.dictionaryDetails);
+        final TextView name = row.findViewById(R.id.dictionaryName);
+        final TextView details = row.findViewById(R.id.dictionaryDetails);
         name.setText(application.getDictionaryName(dictionaryInfo.uncompressedFilename));
 
         final boolean updateAvailable = application.updateAvailable(dictionaryInfo);
-        final Button downloadButton = (Button) row.findViewById(R.id.downloadButton);
+        final Button downloadButton = row.findViewById(R.id.downloadButton);
         final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
         boolean broken = false;
         if (!dictionaryInfo.isValid()) {
@@ -681,21 +693,31 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                     downloadDictionary(downloadable.downloadUrl, downloadable.zipBytes, downloadButton);
                 }
             });
+            downloadButton.setVisibility(View.VISIBLE);
         } else {
-            downloadButton.setVisibility(View.INVISIBLE);
+            downloadButton.setVisibility(View.GONE);
         }
 
-        LinearLayout buttons = (LinearLayout) row.findViewById(R.id.dictionaryLauncherButtons);
+        LinearLayout buttons = row.findViewById(R.id.dictionaryLauncherButtons);
+
         final List<IndexInfo> sortedIndexInfos = application
                 .sortedIndexInfos(dictionaryInfo.indexInfos);
         final StringBuilder builder = new StringBuilder();
         if (updateAvailable) {
             builder.append(getString(R.string.updateAvailable));
         }
-        for (IndexInfo indexInfo : sortedIndexInfos) {
-            final View button = IsoUtils.INSTANCE.createButton(buttons.getContext(), dictionaryInfo,
+        assert buttons.getChildCount() == 4;
+        for (int i = 0; i < 2; i++) {
+            final Button textButton = (Button)buttons.getChildAt(2*i);
+            final ImageButton imageButton = (ImageButton)buttons.getChildAt(2*i + 1);
+            if (i >= sortedIndexInfos.size()) {
+                textButton.setVisibility(View.GONE);
+                imageButton.setVisibility(View.GONE);
+                continue;
+            }
+            final IndexInfo indexInfo = sortedIndexInfos.get(i);
+            final View button = IsoUtils.INSTANCE.setupButton(textButton, imageButton, dictionaryInfo,
                                 indexInfo, application.languageButtonPixels);
-            buttons.addView(button);
 
             if (canLaunch) {
                 button.setOnClickListener(
@@ -704,10 +726,9 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                                                application.getPath(dictionaryInfo.uncompressedFilename),
                                                indexInfo.shortName, "")));
 
-            } else {
-                button.setEnabled(false);
-                button.setFocusable(false);
             }
+            button.setEnabled(canLaunch);
+            button.setFocusable(canLaunch);
             if (builder.length() != 0) {
                 builder.append("; ");
             }