Moved the search from the actionbar to the threadfragment.

Not as buggy now.

Clover/app/src/main/java/org/floens/chan/ui/activity/BaseActivity.java

@@ -93,8 +93,6 @@ public abstract class BaseActivity extends Activity implements PanelSlideListene
 
     abstract public void onThreadLoaded(Loadable loadable, List<Post> posts);
 
-    abstract public void onSetFilter(String filter);
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

Clover/app/src/main/java/org/floens/chan/ui/activity/BoardActivity.java

@@ -37,7 +37,6 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.FrameLayout;
-import android.widget.SearchView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -67,9 +66,6 @@ public class BoardActivity extends BaseActivity implements AdapterView.OnItemSel
     private boolean ignoreNextOnItemSelected = false;
     private Spinner boardSpinner;
     private BoardSpinnerAdapter spinnerAdapter;
-    private SearchView searchView;
-    private MenuItem searchMenuItem;
-    private boolean searchBoard;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -184,59 +180,6 @@ public class BoardActivity extends BaseActivity implements AdapterView.OnItemSel
         pinDrawerListener.syncState();
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-
-        searchMenuItem = menu.findItem(R.id.action_search);
-
-        searchView = (SearchView) searchMenuItem.getActionView();
-        searchView.setQueryHint(getString(R.string.search_hint));
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                doSearch(query);
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                doSearch(newText);
-                return false;
-            }
-        });
-        searchMenuItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
-            @Override
-            public boolean onMenuItemActionExpand(MenuItem item) {
-                return true;
-            }
-
-            @Override
-            public boolean onMenuItemActionCollapse(MenuItem item) {
-                threadFragment.setFilter("");
-                boardFragment.setFilter("");
-
-                return true;
-            }
-        });
-
-        return true;
-    }
-
-    @Override
-    public void onSetFilter(String filter) {
-        if (searchView != null) {
-            searchView.setQuery("", true);
-        }
-    }
-
-    @Override
-    public void onPanelSlide(View view, float offset) {
-        super.onPanelSlide(view, offset);
-
-        searchMenuItem.collapseActionView();
-    }
-
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -459,8 +402,6 @@ public class BoardActivity extends BaseActivity implements AdapterView.OnItemSel
         setMenuItemEnabled(menu.findItem(R.id.action_search), slidable);
         setMenuItemEnabled(menu.findItem(R.id.action_search_tablet), !slidable);
 
-        showSearch(false);
-
         return super.onPrepareOptionsMenu(menu);
     }
 
@@ -535,13 +476,18 @@ public class BoardActivity extends BaseActivity implements AdapterView.OnItemSel
                     startLoadingBoard(boardLoadable);
                 }
                 return true;
+            case R.id.action_search:
+                if (threadPane.isOpen()) {
+                    boardFragment.startFiltering();
+                } else {
+                    threadFragment.startFiltering();
+                }
+                return true;
             case R.id.action_search_board:
-                showSearch(true);
+                boardFragment.startFiltering();
-                searchBoard = true;
                 return true;
             case R.id.action_search_thread:
-                showSearch(true);
+                threadFragment.startFiltering();
-                searchBoard = false;
                 return true;
             case android.R.id.home:
                 threadPane.openPane();
@@ -608,32 +554,6 @@ public class BoardActivity extends BaseActivity implements AdapterView.OnItemSel
         updateActionBarState();
     }
 
-    private void showSearch(boolean show) {
-        if (searchMenuItem != null) {
-            if (show) {
-                searchMenuItem.expandActionView();
-            } else {
-                searchMenuItem.collapseActionView();
-            }
-        }
-    }
-
-    private void doSearch(String filter) {
-        if (threadPane.isSlideable()) {
-            if (threadPane.isOpen()) {
-                boardFragment.setFilter(filter);
-            } else {
-                threadFragment.setFilter(filter);
-            }
-        } else {
-            if (searchBoard) {
-                boardFragment.setFilter(filter);
-            } else {
-                threadFragment.setFilter(filter);
-            }
-        }
-    }
-
     /**
      * Handle opening from an external url.
      *

Clover/app/src/main/java/org/floens/chan/ui/fragment/ThreadFragment.java

@@ -22,7 +22,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -35,6 +34,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
+import android.widget.SearchView;
 import android.widget.TextView;
 
 import com.android.volley.NetworkError;
@@ -52,6 +52,7 @@ import org.floens.chan.ui.activity.BaseActivity;
 import org.floens.chan.ui.activity.ImageViewActivity;
 import org.floens.chan.ui.adapter.PostAdapter;
 import org.floens.chan.ui.view.LoadView;
+import org.floens.chan.utils.ThemeHelper;
 import org.floens.chan.utils.Utils;
 
 import java.util.List;
@@ -70,7 +71,6 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
     private SkipLogic skipLogic;
     private int highlightedPost = -1;
     private ThreadManager.ViewMode viewMode = ThreadManager.ViewMode.LIST;
-    private String lastFilter = "";
     private boolean isFiltering = false;
 
     public static ThreadFragment newInstance(BaseActivity activity) {
@@ -120,10 +120,11 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
         return threadManager.getLoader();
     }
 
-    public void setFilter(String filter) {
+    public void startFiltering() {
-        if (!filter.equals(lastFilter) && postAdapter != null) {
+        if (filterView != null) {
-            lastFilter = filter;
+            isFiltering = true;
-            postAdapter.setFilter(filter);
+            filterView.setVisibility(View.VISIBLE);
+            filterView.focusSearch();
         }
     }
 
@@ -166,8 +167,8 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
     public void onPostClicked(Post post) {
         if (loadable.isBoardMode() || loadable.isCatalogMode()) {
             baseActivity.onOPClicked(post);
-        } else if (loadable.isThreadMode() && !TextUtils.isEmpty(lastFilter)) {
+        } else if (loadable.isThreadMode() && isFiltering) {
-            baseActivity.onSetFilter("");
+            filterView.clearSearch();
             postAdapter.scrollToPost(post.no);
         }
     }
@@ -211,6 +212,54 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
     @Override
     public void onThreadLoaded(List posts, boolean append) {
         if (postAdapter == null) {
+            if (container != null) {
+                container.setView(createView());
+            }
+        }
+
+        postAdapter.setStatusMessage(null);
+
+        if (append) {
+            postAdapter.appendList(posts);
+        } else {
+            postAdapter.setList(posts);
+        }
+
+        if (highlightedPost >= 0) {
+            threadManager.highlightPost(highlightedPost);
+            postAdapter.scrollToPost(highlightedPost);
+            highlightedPost = -1;
+        }
+
+        baseActivity.onThreadLoaded(loadable, posts);
+    }
+
+    @Override
+    public void onThreadLoadError(VolleyError error) {
+        if (error instanceof EndOfLineException) {
+            postAdapter.setEndOfLine(true);
+        } else {
+            if (postAdapter == null) {
+                if (container != null) {
+                    container.setView(getLoadErrorTextView(error));
+                }
+            } else {
+                postAdapter.setStatusMessage(getLoadErrorText(error));
+            }
+        }
+
+        highlightedPost = -1;
+    }
+
+    public void onFilterResults(String filter, int count, boolean all) {
+        isFiltering = !all;
+
+        if (filterView != null) {
+            filterView.setText(filter, count, all);
+        }
+    }
+
+    private RelativeLayout createView() {
         RelativeLayout compound = new RelativeLayout(baseActivity);
 
         LinearLayout listViewContainer = new LinearLayout(baseActivity);
@@ -290,56 +339,7 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
             skipLogic = new SkipLogic(skip, listView);
         }
 
-            if (container != null) {
+        return compound;
-                container.setView(compound);
-            }
-        }
-
-        postAdapter.setStatusMessage(null);
-
-        if (append) {
-            postAdapter.appendList(posts);
-        } else {
-            postAdapter.setList(posts);
-        }
-
-        if (highlightedPost >= 0) {
-            threadManager.highlightPost(highlightedPost);
-            postAdapter.scrollToPost(highlightedPost);
-            highlightedPost = -1;
-        }
-
-        baseActivity.onThreadLoaded(loadable, posts);
-    }
-
-    @Override
-    public void onThreadLoadError(VolleyError error) {
-        if (error instanceof EndOfLineException) {
-            postAdapter.setEndOfLine(true);
-        } else {
-            if (postAdapter == null) {
-                if (container != null) {
-                    container.setView(getLoadErrorTextView(error));
-                }
-            } else {
-                postAdapter.setStatusMessage(getLoadErrorText(error));
-            }
-        }
-
-        highlightedPost = -1;
-    }
-
-    public void onFilterResults(String filter, int count, boolean all) {
-        isFiltering = !all;
-
-        if (filterView != null) {
-            if (all) {
-                filterView.setVisibility(View.GONE);
-            } else {
-                filterView.setVisibility(View.VISIBLE);
-                filterView.setText(filter, count);
-            }
-        }
     }
 
     private void setEmpty() {
@@ -356,6 +356,13 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
 
         skip = null;
         skipLogic = null;
+        filterView = null;
+    }
+
+    private void doFilter(String filter) {
+        if (postAdapter != null) {
+            postAdapter.setFilter(filter);
+        }
     }
 
     /**
@@ -452,6 +459,7 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
     }
 
     public class FilterView extends LinearLayout {
+        private SearchView searchView;
         private TextView textView;
 
         public FilterView(Context activity) {
@@ -469,16 +477,79 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
             init();
         }
 
+        public void focusSearch() {
+            searchView.requestFocus();
+        }
+
+        public void clearSearch() {
+            searchView.setQuery("", false);
+            doFilter("");
+            setVisibility(View.GONE);
+        }
+
         private void init() {
+            setOrientation(LinearLayout.VERTICAL);
+
+            LinearLayout searchViewContainer = new LinearLayout(getContext());
+            searchViewContainer.setOrientation(LinearLayout.HORIZONTAL);
+
+            searchView = new SearchView(getContext());
+            searchView.setIconifiedByDefault(false);
+            searchViewContainer.addView(searchView);
+            LinearLayout.LayoutParams searchViewParams = (LinearLayout.LayoutParams) searchView.getLayoutParams();
+            searchViewParams.weight = 1f;
+            searchViewParams.width = 0;
+            searchViewParams.height = LayoutParams.MATCH_PARENT;
+            searchView.setLayoutParams(searchViewParams);
+
+            ImageView closeButton = new ImageView(getContext());
+            searchViewContainer.addView(closeButton);
+            closeButton.setImageResource(ThemeHelper.getInstance().getTheme().isLightTheme ? R.drawable.ic_action_cancel : R.drawable.ic_action_cancel_dark);
+            LinearLayout.LayoutParams closeButtonParams = (LinearLayout.LayoutParams) closeButton.getLayoutParams();
+            searchViewParams.width = Utils.dp(48);
+            searchViewParams.height = LayoutParams.MATCH_PARENT;
+            closeButton.setLayoutParams(closeButtonParams);
+            Utils.setPressedDrawable(closeButton);
+            int padding = Utils.dp(8);
+            closeButton.setPadding(padding, padding, padding, padding);
+
+            closeButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    clearSearch();
+                }
+            });
+
+            addView(searchViewContainer, new LayoutParams(LayoutParams.MATCH_PARENT, Utils.dp(48)));
+
+            searchView.setQueryHint(getString(R.string.search_hint));
+            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+                @Override
+                public boolean onQueryTextSubmit(String query) {
+                    doFilter(query);
+                    return false;
+                }
+
+                @Override
+                public boolean onQueryTextChange(String newText) {
+                    doFilter(newText);
+                    return false;
+                }
+            });
+
             textView = new TextView(getContext());
             textView.setGravity(Gravity.CENTER);
             addView(textView, new LayoutParams(LayoutParams.MATCH_PARENT, Utils.dp(48)));
         }
 
-        private void setText(String filter, int count) {
+        private void setText(String filter, int count, boolean all) {
+            if (all) {
+                textView.setText("");
+            } else {
                 String posts = getContext().getString(count == 1 ? R.string.one_post : R.string.multiple_posts);
                 String text = getContext().getString(R.string.search_results, Integer.toString(count), posts, filter);
                 textView.setText(text);
             }
         }
+    }
 }

Clover/app/src/main/res/menu/base.xml

@@ -79,9 +79,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <item
         android:id="@+id/action_search"
-        android:actionViewClass="android.widget.SearchView"
         android:orderInCategory="6"
-        android:showAsAction="never|collapseActionView"
         android:title="@string/action_search" />
 
     <item