Merge pull request #168 from indication/fix_search

Fix search

Author: in dow

OpenRedmine/src/main/java/jp/redmine/redmineclient/adapter/WikiListAdapter.java

@@ -59,6 +59,19 @@ protected QueryBuilder<RedmineWiki, Long> getQueryBuilder() throws SQLException
 		;
 		return builder;
 	}
+	@Override
+	protected QueryBuilder<RedmineWiki, Long> getSearchQueryBuilder(String search) throws SQLException {
+		QueryBuilder<RedmineWiki, Long> builder = getQueryBuilder();
+		builder.where()
+				.like(RedmineWiki.TITLE, "%"+search+"%")
+				.and()
+				.eq(RedmineWiki.CONNECTION, connection_id)
+				.and()
+				.eq(RedmineWiki.PROJECT_ID, project_id)
+		;
+		builder.orderBy(RedmineWiki.TITLE, true);
+		return builder;
+	}
 
 	@Override
 	protected long getDbItemId(RedmineWiki item) {

OpenRedmine/src/main/java/jp/redmine/redmineclient/entity/RedmineProject.java

@@ -16,7 +16,7 @@ public class RedmineProject
 	public final static String ID = "id";
 	public final static String CONNECTION = RedmineConnection.CONNECTION_ID;
 	public final static String PROJECT_ID = "project_id";
-	public final static String NAME = "kind";
+	public final static String NAME = "name";
 	public final static String FAVORITE = "favorite";
 
     @DatabaseField(generatedId = true)

OpenRedmine/src/main/java/jp/redmine/redmineclient/fragment/ProjectList.java

@@ -180,7 +180,6 @@ protected void onPreExecute() {
 		@Override
 		protected void onPostExecute(Void b) {
 			mFooter.setVisibility(View.GONE);
-			adapter.notifyDataSetInvalidated();
 			adapter.notifyDataSetChanged();
 			if(menu_refresh != null)
 				menu_refresh.setEnabled(true);

OpenRedmine/src/main/java/jp/redmine/redmineclient/fragment/WikiList.java

@@ -1,9 +1,14 @@
 package jp.redmine.redmineclient.fragment;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.v4.widget.ListFragmentSwipeRefreshLayout;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.SearchView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -12,7 +17,6 @@
 import android.view.ViewGroup;
 import android.widget.ListView;
 
-import android.support.v4.widget.ListFragmentSwipeRefreshLayout;
 import com.j256.ormlite.android.apptools.OrmLiteListFragment;
 
 import jp.redmine.redmineclient.R;
@@ -75,6 +79,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
 
 		getListView().setFastScrollEnabled(true);
+		getListView().setTextFilterEnabled(true);
 
 		adapter = new WikiListAdapter(getHelper(), getActivity());
 		ProjectArgument intent = new ProjectArgument();
@@ -173,6 +178,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		menu_refresh = menu.findItem(R.id.menu_refresh);
 		if(task != null && task.getStatus() == AsyncTask.Status.RUNNING)
 			menu_refresh.setEnabled(false);
+		setupSearchBar(menu);
 		super.onCreateOptionsMenu(menu, inflater);
 	}
 
@@ -189,4 +195,32 @@ public boolean onOptionsItemSelected(MenuItem item)
 		}
 		return super.onOptionsItemSelected(item);
 	}
+	@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+	protected void setupSearchBar(Menu menu){
+
+		SearchView search = new SearchView(getActivity());
+		search.setIconifiedByDefault(false);
+		search.setSubmitButtonEnabled(true);
+		search.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+			@Override
+			public boolean onQueryTextSubmit(String s) {
+				return onQueryTextChange(s);
+			}
+
+			@Override
+			public boolean onQueryTextChange(String s) {
+				if (TextUtils.isEmpty(s)) {
+					getListView().clearTextFilter();
+				} else {
+					getListView().setFilterText(s);
+				}
+				return true;
+			}
+		});
+		menu.add(android.R.string.search_go)
+				.setIcon(android.R.drawable.ic_menu_search)
+				.setActionView(search)
+				.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW)
+		;
+	}
 }

OpenRedmine/src/main/res/raw/version.md

@@ -9,7 +9,8 @@ TODO
 
 Next Release
 ===========
-
+- Fix search on project list
+- Add search on wiki list
 
 v3.16 - 49 - 2015/11/18
 ===========