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

BookmarkSearchPatternOption has been moved to the BookmarksActivity class

Browse source
This commit is contained in:
Nikolay Pultsin 2011-01-23 17:22:34 +00:00
parent 2f3b21f11f
commit ac20aa2b4f
2 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,8 @@ import android.content.*;
import org.geometerplus.zlibrary.core.util.ZLMiscUtil; import org.geometerplus.zlibrary.core.util.ZLMiscUtil;
import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.options.ZLStringOption;
import org.geometerplus.zlibrary.text.view.*; import org.geometerplus.zlibrary.text.view.*;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
@ -52,6 +54,8 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
private ListView mySearchResultsView; private ListView mySearchResultsView;
private final ZLResource myResource = ZLResource.resource("bookmarksView"); private final ZLResource myResource = ZLResource.resource("bookmarksView");
private final ZLStringOption myBookmarkSearchPatternOption =
new ZLStringOption("BookmarkSearch", "Pattern", "");
private ListView createTab(String tag, int id) { private ListView createTab(String tag, int id) {
final TabHost host = getTabHost(); final TabHost host = getTabHost();
@ -99,28 +103,13 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
findViewById(R.id.search_results).setVisibility(View.GONE); 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 b : AllBooksBookmarks) {
if (ZLMiscUtil.matchesIgnoreCase(b.getText(), pattern)) {
bookmarks.add(b);
}
}
return bookmarks;
}
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
if (!Intent.ACTION_SEARCH.equals(intent.getAction())) { if (!Intent.ACTION_SEARCH.equals(intent.getAction())) {
return; return;
} }
String pattern = intent.getStringExtra(SearchManager.QUERY); String pattern = intent.getStringExtra(SearchManager.QUERY);
final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance(); myBookmarkSearchPatternOption.setValue(pattern);
fbreader.BookmarkSearchPatternOption.setValue(pattern);
final LinkedList<Bookmark> bookmarks = new LinkedList<Bookmark>(); final LinkedList<Bookmark> bookmarks = new LinkedList<Bookmark>();
pattern = pattern.toLowerCase(); pattern = pattern.toLowerCase();
@ -158,8 +147,7 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
@Override @Override
public boolean onSearchRequested() { public boolean onSearchRequested() {
final FBReaderApp fbreader = (FBReaderApp)FBReaderApp.Instance(); startSearch(myBookmarkSearchPatternOption.getValue(), true, null, false);
startSearch(fbreader.BookmarkSearchPatternOption.getValue(), true, null, false);
return true; return true;
} }

2
src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
View file

@ -36,8 +36,6 @@ public final class FBReaderApp extends ZLApplication {
new ZLBooleanOption("LookNFeel", "AllowScreenBrightnessAdjustment", true); new ZLBooleanOption("LookNFeel", "AllowScreenBrightnessAdjustment", true);
public final ZLStringOption TextSearchPatternOption = public final ZLStringOption TextSearchPatternOption =
new ZLStringOption("TextSearch", "Pattern", ""); new ZLStringOption("TextSearch", "Pattern", "");
public final ZLStringOption BookmarkSearchPatternOption =
new ZLStringOption("BookmarkSearch", "Pattern", "");
public final ZLBooleanOption UseSeparateBindingsOption = public final ZLBooleanOption UseSeparateBindingsOption =
new ZLBooleanOption("KeysOptions", "UseSeparateBindings", false); new ZLBooleanOption("KeysOptions", "UseSeparateBindings", false);