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

see previous commit

Browse source
This commit is contained in:
Nikolay Pultsin 2011-07-11 17:15:22 +01:00
parent 1bb214605f
commit 211e1977e4
5 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ import java.util.*;
import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.filesystem.*; import org.geometerplus.zlibrary.core.filesystem.*;
import org.geometerplus.zlibrary.core.application.*; import org.geometerplus.zlibrary.core.application.*;
import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; import org.geometerplus.zlibrary.core.util.ZLMainWindowUtil;
import org.geometerplus.zlibrary.core.options.*; import org.geometerplus.zlibrary.core.options.*;
import org.geometerplus.zlibrary.core.util.ZLColor; import org.geometerplus.zlibrary.core.util.ZLColor;
@ -137,7 +137,7 @@ public final class FBReaderApp extends ZLApplication {
public void initWindow() { public void initWindow() {
super.initWindow(); super.initWindow();
ZLDialogManager.Instance().wait("loadingBook", new Runnable() { ZLMainWindowUtil.Instance().wait("loadingBook", new Runnable() {
public void run() { public void run() {
Book book = createBookForFile(ZLFile.createFileByPath(myArg0)); Book book = createBookForFile(ZLFile.createFileByPath(myArg0));
if (book == null) { if (book == null) {
@ -160,7 +160,7 @@ public final class FBReaderApp extends ZLApplication {
return; return;
} }
} }
ZLDialogManager.Instance().wait("loadingBook", new Runnable() { ZLMainWindowUtil.Instance().wait("loadingBook", new Runnable() {
public void run() { public void run() {
openBookInternal(book, bookmark); openBookInternal(book, bookmark);
} }

11
src/org/geometerplus/zlibrary/core/util/ZLMainWindowUtil.java
View file

@ -17,18 +17,19 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.zlibrary.core.dialogs; package org.geometerplus.zlibrary.core.util;
public abstract class ZLDialogManager { public abstract class ZLMainWindowUtil {
protected static ZLDialogManager ourInstance; protected static ZLMainWindowUtil ourInstance;
protected ZLDialogManager() { protected ZLMainWindowUtil() {
ourInstance = this; ourInstance = this;
} }
public static ZLDialogManager Instance() { public static ZLMainWindowUtil Instance() {
return ourInstance; return ourInstance;
} }
public abstract void setTitle(String key);
public abstract void wait(String key, Runnable runnable); public abstract void wait(String key, Runnable runnable);
} }

4
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
View file

@ -27,7 +27,7 @@ import org.geometerplus.zlibrary.core.options.ZLIntegerRangeOption;
import org.geometerplus.zlibrary.core.sqliteconfig.ZLSQLiteConfig; import org.geometerplus.zlibrary.core.sqliteconfig.ZLSQLiteConfig;
import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWindow; import org.geometerplus.zlibrary.ui.android.application.ZLAndroidApplicationWindow;
import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; import org.geometerplus.zlibrary.ui.android.util.ZLAndroidMainWindowUtil;
import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager; import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager;
public class ZLAndroidApplication extends Application { public class ZLAndroidApplication extends Application {
@ -64,7 +64,7 @@ public class ZLAndroidApplication extends Application {
super.onCreate(); super.onCreate();
new ZLSQLiteConfig(this); new ZLSQLiteConfig(this);
new ZLAndroidImageManager(); new ZLAndroidImageManager();
new ZLAndroidDialogManager(); new ZLAndroidMainWindowUtil();
new ZLAndroidLibrary(this); new ZLAndroidLibrary(this);
} }
} }

4
src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
View file

@ -35,7 +35,7 @@ import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.zlibrary.ui.android.view.ZLAndroidWidget; import org.geometerplus.zlibrary.ui.android.view.ZLAndroidWidget;
import org.geometerplus.zlibrary.ui.android.dialogs.ZLAndroidDialogManager; import org.geometerplus.zlibrary.ui.android.util.ZLAndroidMainWindowUtil;
public final class ZLAndroidLibrary extends ZLibrary { public final class ZLAndroidLibrary extends ZLibrary {
private ZLAndroidActivity myActivity; private ZLAndroidActivity myActivity;
@ -48,7 +48,7 @@ public final class ZLAndroidLibrary extends ZLibrary {
void setActivity(ZLAndroidActivity activity) { void setActivity(ZLAndroidActivity activity) {
myActivity = activity; myActivity = activity;
((ZLAndroidDialogManager)ZLAndroidDialogManager.Instance()).setActivity(activity); ((ZLAndroidMainWindowUtil)ZLAndroidMainWindowUtil.Instance()).setActivity(activity);
myWidget = null; myWidget = null;
} }

22
src/org/geometerplus/zlibrary/ui/android/util/ZLAndroidMainWindowUtil.java
View file

@ -17,25 +17,37 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.zlibrary.ui.android.dialogs; package org.geometerplus.zlibrary.ui.android.util;
import android.app.*; import android.app.*;
import org.geometerplus.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.util.*;
import org.geometerplus.android.util.UIUtil; import org.geometerplus.android.util.UIUtil;
public class ZLAndroidDialogManager extends ZLDialogManager { public class ZLAndroidMainWindowUtil extends ZLMainWindowUtil {
private Activity myActivity; private Activity myActivity;
public ZLAndroidDialogManager() { public ZLAndroidMainWindowUtil() {
} }
public void setActivity(Activity activity) { public void setActivity(Activity activity) {
myActivity = activity; myActivity = activity;
} }
@Override
public void wait(String key, Runnable action) { public void wait(String key, Runnable action) {
UIUtil.wait(key, action, myActivity); if (myActivity != null) {
UIUtil.wait(key, action, myActivity);
} else {
action.run();
}
}
@Override
public void setTitle(String title) {
if (myActivity != null) {
myActivity.setTitle(title);
}
} }
} }