yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 02:39:23 +02:00
Code Issues Releases Wiki Activity

BookmarksActivity search code cleanup: separate search activity has been removed

Browse source
This commit is contained in:
Nikolay Pultsin 2011-01-23 15:43:25 +00:00
parent 7462fab0dc
commit b48b7c0c54
4 changed files with 54 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/org/geometerplus/android/fbreader/BookmarksActivity.java
View file

@ -21,12 +21,13 @@ package org.geometerplus.android.fbreader;
import java.util.*;
import android.app.*;
import android.os.*;
import android.view.*;
import android.widget.*;
import android.content.*;
import android.app.TabActivity;
import org.geometerplus.zlibrary.core.util.ZLMiscUtil;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.text.view.*;
@ -35,6 +36,8 @@ import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.library.*;
import org.geometerplus.android.util.UIUtil;
public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuItemClickListener {
static BookmarksActivity Instance;
@ -68,6 +71,9 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
requestWindowFeature(Window.FEATURE_NO_TITLE);
setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
final SearchManager manager = (SearchManager)getSystemService(SEARCH_SERVICE);
manager.setOnCancelListener(null);
final TabHost host = getTabHost();
LayoutInflater.from(this).inflate(R.layout.bookmarks, host.getTabContentView(), true);
@ -95,6 +101,43 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
findViewById(R.id.search_results).setVisibility(View.GONE);
}
public List<Bookmark> runSearch(String pattern) {
final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
fbreader.BookmarkSearchPatternOption.setValue(pattern);
final LinkedList<Bookmark> bookmarks = new LinkedList<Bookmark>();
pattern = pattern.toLowerCase();
for (Bookmark bookmark : BookmarksActivity.Instance.AllBooksBookmarks) {
if (ZLMiscUtil.matchesIgnoreCase(bookmark.getText(), pattern)) {
bookmarks.add(bookmark);
}
}
return bookmarks;
}
@Override
protected void onNewIntent(Intent intent) {
if (!Intent.ACTION_SEARCH.equals(intent.getAction())) {
return;
}
String pattern = intent.getStringExtra(SearchManager.QUERY);
final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance();
fbreader.BookmarkSearchPatternOption.setValue(pattern);
final LinkedList<Bookmark> bookmarks = new LinkedList<Bookmark>();
pattern = pattern.toLowerCase();
for (Bookmark b : BookmarksActivity.Instance.AllBooksBookmarks) {
if (ZLMiscUtil.matchesIgnoreCase(b.getText(), pattern)) {
bookmarks.add(b);
}
}
if (!bookmarks.isEmpty()) {
showSearchResultsTab(bookmarks);
} else {
UIUtil.showErrorMessage(this, "bookmarkNotFound");
}
}
@Override
public void onResume() {
super.onResume();