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

special search dialog (in progress)

Browse source
This commit is contained in:
Nikolay Pultsin 2014-01-28 01:52:24 +00:00
parent 1aad279b09
commit 96b7dddf10
3 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,8 +36,7 @@ import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.fbreader.book.*; import org.geometerplus.fbreader.book.*;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow; import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.util.UIUtil; import org.geometerplus.android.util.*;
import org.geometerplus.android.util.ViewUtil;
public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuItemClickListener { public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuItemClickListener {
private static final int OPEN_ITEM_ID = 0; private static final int OPEN_ITEM_ID = 0;
@ -189,7 +188,10 @@ public class BookmarksActivity extends TabActivity implements MenuItem.OnMenuIte
@Override @Override
public boolean onSearchRequested() { public boolean onSearchRequested() {
startSearch(myBookmarkSearchPatternOption.getValue(), true, null, false); if (DeviceType.Instance().hasStandardSearchDialog()) {
startSearch(myBookmarkSearchPatternOption.getValue(), true, null, false);
} else {
}
return true; return true;
} }

7
src/org/geometerplus/android/fbreader/library/LibraryActivity.java
View file

@ -36,7 +36,7 @@ import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.library.*;
import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.tree.FBTree;
import org.geometerplus.android.util.UIUtil; import org.geometerplus.android.util.*;
import org.geometerplus.android.fbreader.*; import org.geometerplus.android.fbreader.*;
import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow; import org.geometerplus.android.fbreader.libraryService.BookCollectionShadow;
import org.geometerplus.android.fbreader.tree.TreeActivity; import org.geometerplus.android.fbreader.tree.TreeActivity;
@ -145,7 +145,10 @@ public class LibraryActivity extends TreeActivity<LibraryTree> implements MenuIt
@Override @Override
public boolean onSearchRequested() { public boolean onSearchRequested() {
startSearch(BookSearchPatternOption.getValue(), true, null, false); if (DeviceType.Instance().hasStandardSearchDialog()) {
startSearch(BookSearchPatternOption.getValue(), true, null, false);
} else {
}
return true; return true;
} }

7
src/org/geometerplus/android/fbreader/network/action/RunSearchAction.java
View file

@ -31,6 +31,8 @@ import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity; import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
import org.geometerplus.android.util.DeviceType;
public class RunSearchAction extends Action { public class RunSearchAction extends Action {
public static SearchCatalogTree getSearchTree(FBTree tree) { public static SearchCatalogTree getSearchTree(FBTree tree) {
for (; tree != null; tree = tree.Parent) { for (; tree != null; tree = tree.Parent) {
@ -72,6 +74,9 @@ public class RunSearchAction extends Action {
getSearchTree(tree).getUniqueKey() getSearchTree(tree).getUniqueKey()
); );
final NetworkLibrary library = NetworkLibrary.Instance(); final NetworkLibrary library = NetworkLibrary.Instance();
myActivity.startSearch(library.NetworkSearchPatternOption.getValue(), true, bundle, false); if (DeviceType.Instance().hasStandardSearchDialog()) {
myActivity.startSearch(library.NetworkSearchPatternOption.getValue(), true, bundle, false);
} else {
}
} }
} }