X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryActivity.java;h=4e1bf6572d453b3d028c62778b10db5c33ab1474;hb=81e7773623371b4fc2de7bee9a2ad8112dddb30a;hp=837097adecae3df96ad8e5157e6bd73734dcc90b;hpb=8af7e5f3022d277005c7cc430995005d690db7e7;p=Dictionary.git

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 837097a..4e1bf65 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -21,6 +21,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.database.MatrixCursor;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.net.Uri;
@@ -32,6 +34,7 @@ import android.speech.tts.TextToSpeech.OnInitListener;
 import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.view.MenuItemCompat;
+import android.support.v4.widget.CursorAdapter;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SearchView;
@@ -65,6 +68,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AutoCompleteTextView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.FrameLayout;
@@ -101,6 +105,7 @@ import java.io.PrintWriter;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
@@ -147,6 +152,9 @@ public class DictionaryActivity extends AppCompatActivity {
     });
 
     private SearchOperation currentSearchOperation = null;
+    private final int MAX_SEARCH_HISTORY = 10;
+    private final ArrayList<String> searchHistory = new ArrayList<>(MAX_SEARCH_HISTORY);
+    private MatrixCursor searchHistoryCursor = new MatrixCursor(new String[] {"_id", "search"});
 
     private TextToSpeech textToSpeech;
     private volatile boolean ttsReady;
@@ -173,6 +181,7 @@ public class DictionaryActivity extends AppCompatActivity {
     }
 
     private SearchView searchView;
+    private AutoCompleteTextView searchTextView;
     private ImageButton languageButton;
     private SearchView.OnQueryTextListener onQueryTextListener;
 
@@ -245,6 +254,23 @@ public class DictionaryActivity extends AppCompatActivity {
         finish();
     }
 
+    private void addToSearchHistory(String text) {
+        if (text == null || text.isEmpty()) return;
+        int exists = searchHistory.indexOf(text);
+        if (exists >= 0) searchHistory.remove(exists);
+        else if (searchHistory.size() >= MAX_SEARCH_HISTORY) searchHistory.remove(searchHistory.size() - 1);
+        searchHistory.add(0, text);
+        searchHistoryCursor = new MatrixCursor(new String[] {"_id", "search"});
+        for (int i = 0; i < searchHistory.size(); i++) {
+            final Object[] row = {i, searchHistory.get(i)};
+            searchHistoryCursor.addRow(row);
+        }
+        if (searchView.getSuggestionsAdapter().getCursor() != null) {
+            searchView.getSuggestionsAdapter().swapCursor(searchHistoryCursor);
+            searchView.getSuggestionsAdapter().notifyDataSetChanged();
+        }
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         DictionaryApplication.INSTANCE.init(getApplicationContext());
@@ -285,7 +311,7 @@ public class DictionaryActivity extends AppCompatActivity {
          *         -> language in which the phrase is written to -> to which
          *         language shall be translated
          */
-        if (intentAction != null && intentAction.equals("com.hughes.action.ACTION_SEARCH_DICT")) {
+        if ("com.hughes.action.ACTION_SEARCH_DICT".equals(intentAction)) {
             String query = intent.getStringExtra(SearchManager.QUERY);
             String from = intent.getStringExtra("from");
             if (from != null)
@@ -571,6 +597,37 @@ public class DictionaryActivity extends AppCompatActivity {
         if (text == null) {
             text = "";
         }
+
+        searchView.setOnSuggestionListener(new SearchView.OnSuggestionListener() {
+            @Override
+            public boolean onSuggestionSelect(int position) {
+                return false;
+            }
+
+            @Override
+            public boolean onSuggestionClick(int position) {
+                setSearchText(searchHistory.get(position), true);
+                return true;
+            }
+        });
+        searchView.setSuggestionsAdapter(new CursorAdapter(this, text.isEmpty() ? searchHistoryCursor : null, 0) {
+            @Override
+            public View newView(Context context, Cursor c, ViewGroup p) {
+                TextView v = new TextView(context);
+                v.setTextColor(textColorFg);
+                v.setTypeface(typeface);
+                v.setTextSize(TypedValue.COMPLEX_UNIT_SP, 4 * fontSizeSp / 3);
+                return v;
+            }
+            @Override
+            public void bindView(View v, Context context, Cursor c) {
+                TextView t = (TextView)v;
+                t.setText(c.getString(1));
+            }
+        });
+        // Set up search history
+        addToSearchHistory(text);
+
         setSearchText(text, true);
         Log.d(LOG, "Trying to restore searchText=" + text);
 
@@ -629,6 +686,7 @@ public class DictionaryActivity extends AppCompatActivity {
             @Override
             public boolean onQueryTextSubmit(String query) {
                 Log.d(LOG, "OnQueryTextListener: onQueryTextSubmit: " + searchView.getQuery());
+                addToSearchHistory(searchView.getQuery().toString());
                 hideKeyboard();
                 return true;
             }
@@ -642,6 +700,7 @@ public class DictionaryActivity extends AppCompatActivity {
         };
         searchView.setOnQueryTextListener(onQueryTextListener);
         searchView.setFocusable(true);
+        searchTextView = (AutoCompleteTextView)searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text);
         LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(0,
                 FrameLayout.LayoutParams.WRAP_CONTENT, 1);
         customSearchView.addView(searchView, lp);
@@ -742,14 +801,23 @@ public class DictionaryActivity extends AppCompatActivity {
                     Log.d(LOG, "Trying to show soft keyboard.");
                     final boolean searchTextHadFocus = searchView.hasFocus();
                     searchView.requestFocusFromTouch();
+                    searchTextView.requestFocus();
                     final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
                     manager.showSoftInput(searchView, InputMethodManager.SHOW_IMPLICIT);
+                    manager.showSoftInput(searchTextView, InputMethodManager.SHOW_IMPLICIT);
                     if (!searchTextHadFocus) {
                         defocusSearchText();
                     }
                 }
             }, delay);
         }
+        searchView.post(new Runnable() {
+            @Override
+            public void run() {
+                searchTextView.setThreshold(0);
+                searchTextView.showDropDown();
+            }
+        });
     }
 
     private void hideKeyboard() {
@@ -846,7 +914,7 @@ public class DictionaryActivity extends AppCompatActivity {
 
                 final LinearLayout result = new LinearLayout(parent.getContext());
 
-                for (int i = 0; dictionaryInfo.indexInfos != null && i < dictionaryInfo.indexInfos.size(); ++i) {
+                for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
                     final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
                     final View button = IsoUtils.INSTANCE.createButton(parent.getContext(),
                             indexInfo, application.languageButtonPixels);
@@ -1243,7 +1311,7 @@ public class DictionaryActivity extends AppCompatActivity {
         try {
             wordList.getParentFile().mkdirs();
             final PrintWriter out = new PrintWriter(new FileWriter(wordList, true));
-            out.println(rawText.toString());
+            out.println(rawText);
             out.close();
         } catch (Exception e) {
             Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
@@ -1351,7 +1419,9 @@ public class DictionaryActivity extends AppCompatActivity {
         Log.d(LOG, "searchFinished: " + searchOperation + ", searchResult=" + searchResult);
 
         currentSearchOperation = null;
-        uiHandler.postDelayed(new Runnable() {
+        // Note: it's important to post to the ListView, otherwise
+        // the jumpToRow will randomly not work.
+        getListView().post(new Runnable() {
             @Override
             public void run() {
                 if (currentSearchOperation == null) {
@@ -1370,10 +1440,10 @@ public class DictionaryActivity extends AppCompatActivity {
                     Log.d(LOG, "More coming, waiting for currentSearchOperation.");
                 }
             }
-        }, 20);
+        });
     }
 
-    private final void jumpToRow(final int row) {
+    private void jumpToRow(final int row) {
         Log.d(LOG, "jumpToRow: " + row + ", refocusSearchText=" + false);
         // getListView().requestFocusFromTouch();
         getListView().setSelectionFromTop(row, 0);
@@ -1406,7 +1476,7 @@ public class DictionaryActivity extends AppCompatActivity {
         }
 
         public String toString() {
-            return String.format("SearchOperation(%s,%s)", searchText, interrupted.toString());
+            return String.format("SearchOperation(%s,%s)", searchText, interrupted);
         }
 
         @Override
@@ -1452,10 +1522,16 @@ public class DictionaryActivity extends AppCompatActivity {
 
     private void showHtml(final List<HtmlEntry> htmlEntries, final String htmlTextToHighlight) {
         String html = HtmlEntry.htmlBody(htmlEntries, index.shortName);
+        String style = "";
+        if (typeface == Typeface.SERIF) { style = "font-family: serif;"; }
+        else if (typeface == Typeface.SANS_SERIF) { style = "font-family: sans-serif;"; }
+        else if (typeface == Typeface.MONOSPACE) { style = "font-family: monospace;"; }
+        if (application.getSelectedTheme() == DictionaryApplication.Theme.DEFAULT)
+            style += "background-color: black; color: white;";
         // Log.d(LOG, "html=" + html);
         startActivityForResult(
             HtmlDisplayActivity.getHtmlIntent(getApplicationContext(), String.format(
-                    "<html><head><meta name=\"viewport\" content=\"width=device-width\"></head><body>%s</body></html>", html),
+                    "<html><head><meta name=\"viewport\" content=\"width=device-width\"></head><body style=\"%s\">%s</body></html>", style, html),
                                               htmlTextToHighlight, false),
             0);
     }
@@ -1846,6 +1922,8 @@ public class DictionaryActivity extends AppCompatActivity {
         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);
+        searchView.getSuggestionsAdapter().swapCursor(text.isEmpty() ? searchHistoryCursor : null);
+        searchView.getSuggestionsAdapter().notifyDataSetChanged();
     }
 
     // --------------------------------------------------------------------------