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

code simplification

Browse source
This commit is contained in:
Nikolay Pultsin 2010-10-21 21:39:12 +01:00
parent 97107959a0
commit 74abbad08a
5 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/org/geometerplus/android/fbreader/FBReader.java
View file

@ -194,6 +194,7 @@ public final class FBReader extends ZLAndroidActivity {
fbReader.addAction(ActionCode.SHOW_NETWORK_LIBRARY, new ShowNetworkLibraryAction(this, fbReader));
fbReader.addAction(ActionCode.SHOW_NAVIGATION, new ShowNavigationAction(this, fbReader));
fbReader.addAction(ActionCode.SEARCH, new SearchAction(this, fbReader));
return fbReader;
}

12
src/org/geometerplus/android/fbreader/SearchAction.java
View file

@ -17,13 +17,17 @@
* 02110-1301, USA.
*/
package org.geometerplus.fbreader.fbreader;
package org.geometerplus.android.fbreader;
import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.fbreader.FBAction;
class SearchAction extends FBAction {
SearchAction(FBReaderApp fbreader) {
private final FBReader myActivity;
SearchAction(FBReader activity, FBReaderApp fbreader) {
super(fbreader);
myActivity = activity;
}
public boolean isVisible() {
@ -31,6 +35,6 @@ class SearchAction extends FBAction {
}
public void run() {
ZLDialogManager.Instance().startSearch();
myActivity.onSearchRequested();
}
}

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

@ -76,7 +76,6 @@ public final class FBReaderApp extends ZLApplication {
addAction(ActionCode.DECREASE_FONT, new ChangeFontSizeAction(this, -2));
addAction(ActionCode.ROTATE, new RotateAction(this));
addAction(ActionCode.SEARCH, new SearchAction(this));
addAction(ActionCode.FIND_NEXT, new FindNextAction(this));
addAction(ActionCode.FIND_PREVIOUS, new FindPreviousAction(this));
addAction(ActionCode.CLEAR_FIND_RESULTS, new ClearFindResultsAction(this));

2
src/org/geometerplus/zlibrary/core/dialogs/ZLDialogManager.java
View file

@ -45,8 +45,6 @@ public abstract class ZLDialogManager {
public abstract void wait(String key, Runnable runnable);
public abstract void startSearch();
public static String getButtonText(String key) {
return getResource().getResource("button").getResource(key).getValue();
}

4
src/org/geometerplus/zlibrary/ui/android/dialogs/ZLAndroidDialogManager.java
View file

@ -45,8 +45,4 @@ public class ZLAndroidDialogManager extends ZLDialogManager {
public void wait(String key, Runnable action) {
AndroidUtil.wait(key, action, myActivity);
}
public void startSearch() {
myActivity.onSearchRequested();
}
}