Support selectable text on newer Android.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 2bfb8c1089f0e4ff4be51e3c00faa18cace4121a..5ea0e271093673edc0562bbc4dc95b430861a64a 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -28,6 +28,7 @@ import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
+import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.MenuItemCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
@@ -208,6 +209,19 @@ public class DictionaryActivity extends ActionBarActivity {
         outState.putString(C.SEARCH_TOKEN, searchView.getQuery().toString());
     }
 
+    private int getMatchLen(String search, Index.IndexEntry e)
+    {
+        if (e == null) return 0;
+        for (int i = 0; i < search.length(); ++i)
+        {
+            String a = search.substring(0, i + 1);
+            String b = e.token.substring(0, i + 1);
+            if (!a.equalsIgnoreCase(b))
+                return i;
+        }
+        return search.length();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         // This needs to be before super.onCreate, otherwise ActionbarSherlock
@@ -300,6 +314,12 @@ public class DictionaryActivity extends ActionBarActivity {
             if (query != null)
                 getIntent().putExtra(C.SEARCH_TOKEN, query);
         }
+        if (intentAction != null && intentAction.equals(Intent.ACTION_SEND))
+        {
+            String query = intent.getStringExtra(Intent.EXTRA_TEXT);
+            if (query != null)
+                getIntent().putExtra(C.SEARCH_TOKEN, query);
+        }
         /*
          * This processes text on M+ devices where QuickDic shows up in the context menu.
          */
@@ -312,7 +332,7 @@ public class DictionaryActivity extends ActionBarActivity {
         /**
          * @author Dominik Köppl If no dictionary is chosen, use the default
          *         dictionary specified in the preferences If this step does
-         *         fail (no default directory specified), show a toast and
+         *         fail (no default dictionary specified), show a toast and
          *         abort.
          */
         if (intent.getStringExtra(C.DICT_FILE) == null)
@@ -322,6 +342,47 @@ public class DictionaryActivity extends ActionBarActivity {
                 intent.putExtra(C.DICT_FILE, application.getPath(dictfile).toString());
         }
         String dictFilename = intent.getStringExtra(C.DICT_FILE);
+        if (dictFilename == null && intent.getStringExtra(C.SEARCH_TOKEN) != null)
+        {
+            final List<DictionaryInfo> dics = application.getDictionariesOnDevice(null);
+            final String search = intent.getStringExtra(C.SEARCH_TOKEN);
+            String bestFname = null;
+            String bestIndex = null;
+            int bestMatchLen = 2; // ignore shorter matches
+            AtomicBoolean dummy = new AtomicBoolean();
+            for (int i = 0; dictFilename == null && i < dics.size(); ++i)
+            {
+                try {
+                    Log.d(LOG, "Checking dictionary " + dics.get(i).uncompressedFilename);
+                    final File dictfile = application.getPath(dics.get(i).uncompressedFilename);
+                    Dictionary dic = new Dictionary(new RandomAccessFile(dictfile, "r"));
+                    for (int j = 0; j < dic.indices.size(); ++j) {
+                        Index idx = dic.indices.get(j);
+                        Log.d(LOG, "Checking index " + idx.shortName);
+                        if (idx.findExact(search) != null)
+                        {
+                            Log.d(LOG, "Found exact match");
+                            dictFilename = dictfile.toString();
+                            intent.putExtra(C.INDEX_SHORT_NAME, idx.shortName);
+                            break;
+                        }
+                        int matchLen = getMatchLen(search, idx.findInsertionPoint(search, dummy));
+                        Log.d(LOG, "Found partial match length " + matchLen);
+                        if (matchLen > bestMatchLen)
+                        {
+                            bestFname = dictfile.toString();
+                            bestIndex = idx.shortName;
+                            bestMatchLen = matchLen;
+                        }
+                    }
+                } catch (Exception e) {}
+            }
+            if (dictFilename == null && bestFname != null)
+            {
+                dictFilename = bestFname;
+                intent.putExtra(C.INDEX_SHORT_NAME, bestIndex);
+            }
+        }
 
         if (dictFilename == null)
         {
@@ -473,6 +534,21 @@ public class DictionaryActivity extends ActionBarActivity {
             }
         });
 
+        final FloatingActionButton floatSearchButton = (FloatingActionButton)findViewById(R.id.floatSearchButton);
+        floatSearchButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+                if (!searchView.hasFocus()) {
+                    searchView.requestFocus();
+                }
+                if (searchView.getQuery().toString().length() > 0) {
+                    searchView.setQuery("", false);
+                }
+                showKeyboard();
+                searchView.setIconified(false);
+            }
+        });
+
         // Set the search text from the intent, then the saved state.
         String text = getIntent().getStringExtra(C.SEARCH_TOKEN);
         if (savedInstanceState != null) {
@@ -516,15 +592,8 @@ public class DictionaryActivity extends ActionBarActivity {
         languageButton.setScaleType(ScaleType.FIT_CENTER);
         languageButton.setOnClickListener(new OnClickListener() {
             @Override
-            public void onClick(View arg0) {
-                onLanguageButtonClick();
-            }
-        });
-        languageButton.setOnLongClickListener(new OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
+            public void onClick(View v) {
                 onLanguageButtonLongClick(v.getContext());
-                return true;
             }
         });
         languageButton.setAdjustViewBounds(true);
@@ -1415,6 +1484,11 @@ public class DictionaryActivity extends ActionBarActivity {
 
                 final TextView col1 = new TextView(tableRow.getContext());
                 final TextView col2 = new TextView(tableRow.getContext());
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB)
+                {
+                    col1.setTextIsSelectable(true);
+                    col2.setTextIsSelectable(true);
+                }
 
                 // Set the columns in the table.
                 if (r > 0) {
@@ -1666,6 +1740,7 @@ public class DictionaryActivity extends ActionBarActivity {
         }
         currentSearchOperation = new SearchOperation(text, index);
         searchExecutor.execute(currentSearchOperation);
+        ((FloatingActionButton)findViewById(R.id.floatSearchButton)).setImageResource(text.length() > 0 ? R.drawable.ic_clear_black_24dp : R.drawable.ic_search_black_24dp);
     }
 
     // --------------------------------------------------------------------------