Many fixes/hack to get a compilable version.

[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 f15a186869c1c1deb01f69b9fbdb022ce1ec0a6e..f932fbc7c1369abd81acfda3b4824409889493b7 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -47,7 +47,9 @@ import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.FrameLayout;
@@ -63,13 +65,13 @@ import android.widget.TextView;
 import android.widget.TextView.BufferType;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockListActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
-import com.actionbarsherlock.widget.SearchView;
-import com.actionbarsherlock.widget.SearchView.OnQueryTextListener;
+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.view.Menu;
+import android.view.MenuItem;
+import android.view.MenuItem.OnMenuItemClickListener;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.dictionary.engine.Dictionary;
 import com.hughes.android.dictionary.engine.EntrySource;
@@ -109,7 +111,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class DictionaryActivity extends SherlockListActivity {
+public class DictionaryActivity extends ActionBarActivity {
 
     static final String LOG = "QuickDic";
 
@@ -145,6 +147,22 @@ public class DictionaryActivity extends SherlockListActivity {
     int textColorFg = Color.BLACK;
     int fontSizeSp;
 
+    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();
+    }
+
     SearchView searchView;
     ImageButton languageButton;
     SearchView.OnQueryTextListener onQueryTextListener;
@@ -197,6 +215,11 @@ public class DictionaryActivity extends SherlockListActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        // This needs to be before super.onCreate, otherwise ActionbarSherlock
+        // doesn't makes the background of the actionbar white when you're
+        // in the dark theme.
+        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
+
         Log.d(LOG, "onCreate:" + this);
         super.onCreate(savedInstanceState);
 
@@ -205,7 +228,6 @@ public class DictionaryActivity extends SherlockListActivity {
         // Don't auto-launch if this fails.
         prefs.edit().remove(C.DICT_FILE).commit();
 
-        setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
 
         application = (DictionaryApplication) getApplication();
         theme = application.getSelectedTheme();
@@ -413,8 +435,7 @@ public class DictionaryActivity extends SherlockListActivity {
         registerForContextMenu(getListView());
 
         // Cache some prefs.
-        wordList = new File(prefs.getString(getString(R.string.wordListFileKey),
-                new File(application.getDictDir(), "wordList.txt").getAbsolutePath()));
+        wordList = application.getWordListFile();
         saveOnlyFirstSubentry = prefs.getBoolean(getString(R.string.saveOnlyFirstSubentryKey),
                 false);
         clickOpensContextMenu = prefs.getBoolean(getString(R.string.clickOpensContextMenuKey),
@@ -440,7 +461,7 @@ public class DictionaryActivity extends SherlockListActivity {
         searchView.requestFocus();
 
         // http://stackoverflow.com/questions/2833057/background-listview-becomes-black-when-scrolling
-        getListView().setCacheColorHint(0);
+//        getListView().setCacheColorHint(0);
     }
 
     private void onCreateSetupActionBarAndSearchView() {
@@ -457,6 +478,13 @@ public class DictionaryActivity extends SherlockListActivity {
                 width, ViewGroup.LayoutParams.WRAP_CONTENT);
         customSearchView.setLayoutParams(layoutParams);
 
+        listView.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int row, long id) {
+                onListItemClick(getListView(), view, row, id);
+            }
+        });
+
         languageButton = new ImageButton(customSearchView.getContext());
         languageButton.setMinimumWidth(application.languageButtonPixels);
         languageButton.setMinimumHeight(application.languageButtonPixels * 2 / 3);
@@ -476,7 +504,7 @@ public class DictionaryActivity extends SherlockListActivity {
         });
         customSearchView.addView(languageButton);
 
-        searchView = new SearchView(customSearchView.getContext());
+        searchView = new SearchView(getSupportActionBar().getThemedContext());
         searchView.setIconifiedByDefault(false);
         // searchView.setIconified(false); // puts the magnifying glass in the
         // wrong place.
@@ -512,13 +540,6 @@ public class DictionaryActivity extends SherlockListActivity {
         searchView.setFocusable(true);
         customSearchView.addView(searchView);
 
-        // Clear the searchHint icon so that it takes as little space as possible.
-        ImageView searchHintIcon = (ImageView) searchView.findViewById(R.id.abs__search_mag_icon);
-        searchHintIcon.setBackgroundResource(android.R.color.transparent);
-        searchHintIcon.setLayoutParams(new LinearLayout.LayoutParams(1, 1));
-        searchHintIcon.setAdjustViewBounds(true);
-        searchHintIcon.setPadding(0, 0, 0, 0);
-        
         actionBar.setCustomView(customSearchView);
         actionBar.setDisplayShowCustomEnabled(true);
     }
@@ -616,7 +637,7 @@ public class DictionaryActivity extends SherlockListActivity {
 
     void updateLangButton() {
         final LanguageResources languageResources =
-                Language.isoCodeToResources.get(index.shortName);
+                DictionaryApplication.isoCodeToResources.get(index.shortName);
         if (languageResources != null && languageResources.flagId != 0) {
             languageButton.setImageResource(languageResources.flagId);
         } else {
@@ -920,6 +941,8 @@ public class DictionaryActivity extends SherlockListActivity {
                             return false;
                         }
                     });
+            // Rats, this won't be shown:
+            //searchForSelection.setIcon(R.drawable.abs__ic_search);
         }
 
         if (row instanceof TokenRow && ttsReady) {
@@ -984,7 +1007,6 @@ public class DictionaryActivity extends SherlockListActivity {
         // searchView.selectAll();
     }
 
-    @Override
     protected void onListItemClick(ListView l, View v, int row, long id) {
         defocusSearchText();
         if (clickOpensContextMenu && dictRaf != null) {
@@ -1008,7 +1030,7 @@ public class DictionaryActivity extends SherlockListActivity {
             final PrintWriter out = new PrintWriter(new FileWriter(wordList, true));
             out.println(rawText.toString());
             out.close();
-        } catch (IOException e) {
+        } catch (Exception e) {
             Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
             Toast.makeText(this,
                     getString(R.string.failedAddingToWordList, wordList.getAbsolutePath()),