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

synchronization with other branches

Browse source
This commit is contained in:
Nikolay Pultsin 2010-11-25 02:14:19 +00:00
parent 231679e8ef
commit d7f3aff4c8
12 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/geometerplus/android/fbreader/LibraryTabActivity.java
View file

@ -97,7 +97,7 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt
}; };
System.err.println("before"); System.err.println("before");
action.run(); action.run();
//AndroidUtil.wait("loadingBookList", action, this); //UIUtil.wait("loadingBookList", action, this);
System.err.println("after"); System.err.println("after");
final Intent intent = getIntent(); final Intent intent = getIntent();

4
src/org/geometerplus/android/fbreader/SQLiteBooksDatabase.java
View file

@ -36,7 +36,7 @@ import org.geometerplus.zlibrary.text.view.ZLTextFixedPosition;
import org.geometerplus.fbreader.library.*; import org.geometerplus.fbreader.library.*;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.UIUtil;
public final class SQLiteBooksDatabase extends BooksDatabase { public final class SQLiteBooksDatabase extends BooksDatabase {
private final String myInstanceId; private final String myInstanceId;
@ -64,7 +64,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
if (version >= currentVersion) { if (version >= currentVersion) {
return; return;
} }
AndroidUtil.wait((version == 0) ? "creatingBooksDatabase" : "updatingBooksDatabase", new Runnable() { UIUtil.wait((version == 0) ? "creatingBooksDatabase" : "updatingBooksDatabase", new Runnable() {
public void run() { public void run() {
myDatabase.beginTransaction(); myDatabase.beginTransaction();

4
src/org/geometerplus/android/fbreader/SearchActivity.java
View file

@ -26,7 +26,7 @@ import android.widget.Toast;
import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.UIUtil;
abstract class SearchActivity extends Activity { abstract class SearchActivity extends Activity {
@Override @Override
@ -66,7 +66,7 @@ abstract class SearchActivity extends Activity {
} }
} }
}; };
AndroidUtil.wait(getWaitMessageResourceKey(), runnable, getParentActivity()); UIUtil.wait(getWaitMessageResourceKey(), runnable, getParentActivity());
} }
finish(); finish();
} }

6
src/org/geometerplus/android/fbreader/network/AuthenticationDialog.java
View file

@ -27,7 +27,7 @@ import android.content.DialogInterface;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.UIUtil;
import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.network.ZLNetworkException;
@ -106,7 +106,7 @@ class AuthenticationDialog extends NetworkDialog {
sendSuccess(false); sendSuccess(false);
} }
}; };
AndroidUtil.wait("authentication", runnable, myActivity); UIUtil.wait("authentication", runnable, myActivity);
} }
@Override @Override
@ -120,7 +120,7 @@ class AuthenticationDialog extends NetworkDialog {
} }
} }
}; };
AndroidUtil.wait("signOut", runnable, myActivity); UIUtil.wait("signOut", runnable, myActivity);
} }
@Override @Override

4
src/org/geometerplus/android/fbreader/network/CustomCatalogDialog.java
View file

@ -33,7 +33,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.UIUtil;
import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.opds.OPDSLinkReader; import org.geometerplus.fbreader.network.opds.OPDSLinkReader;
@ -194,7 +194,7 @@ class CustomCatalogDialog extends NetworkDialog {
handler.sendMessage(handler.obtainMessage(0, error)); handler.sendMessage(handler.obtainMessage(0, error));
} }
}; };
AndroidUtil.wait("loadingCatalogInfo", loadInfoRunnable, myActivity); UIUtil.wait("loadingCatalogInfo", loadInfoRunnable, myActivity);
} }
@Override @Override

4
src/org/geometerplus/android/fbreader/network/NetworkBookActions.java
View file

@ -38,7 +38,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.fbreader.FBReader; import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.*;
@ -401,7 +401,7 @@ class NetworkBookActions extends NetworkTreeActions {
handler.sendMessage(handler.obtainMessage(0, error)); handler.sendMessage(handler.obtainMessage(0, error));
} }
}; // end Runnable }; // end Runnable
AndroidUtil.wait("purchaseBook", runnable, activity); UIUtil.wait("purchaseBook", runnable, activity);
} // end onClick } // end onClick
}; // end listener }; // end listener

4
src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
View file

@ -32,7 +32,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.util.ZLBoolean3; import org.geometerplus.zlibrary.core.util.ZLBoolean3;
import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.UIUtil;
import org.geometerplus.fbreader.network.*; import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.tree.NetworkTreeFactory; import org.geometerplus.fbreader.network.tree.NetworkTreeFactory;
@ -458,7 +458,7 @@ class NetworkCatalogActions extends NetworkTreeActions {
} }
} }
}; };
AndroidUtil.wait("signOut", runnable, activity); UIUtil.wait("signOut", runnable, activity);
} }
private void removeCustomLink(ICustomNetworkLink link) { private void removeCustomLink(ICustomNetworkLink link) {

6
src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
View file

@ -33,7 +33,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.UIUtil;
import org.geometerplus.fbreader.network.NetworkTree; import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.fbreader.network.NetworkLibrary; import org.geometerplus.fbreader.network.NetworkLibrary;
@ -108,7 +108,7 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
// run this method only if myActivity != null // run this method only if myActivity != null
private void runInitialization() { private void runInitialization() {
AndroidUtil.wait("loadingNetworkLibrary", new Runnable() { UIUtil.wait("loadingNetworkLibrary", new Runnable() {
public void run() { public void run() {
String error = null; String error = null;
try { try {
@ -276,7 +276,7 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
} }
}; };
AndroidUtil.wait("updatingCatalogsList", new Runnable() { UIUtil.wait("updatingCatalogsList", new Runnable() {
public void run() { public void run() {
String error = null; String error = null;
try { try {

4
src/org/geometerplus/android/fbreader/network/RegisterUserDialog.java
View file

@ -33,7 +33,7 @@ import android.content.DialogInterface;
import org.geometerplus.zlibrary.ui.android.R; import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.UIUtil;
import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.network.ZLNetworkException;
@ -166,7 +166,7 @@ class RegisterUserDialog extends NetworkDialog {
sendSuccess(false); sendSuccess(false);
} }
}; };
AndroidUtil.wait("registerUser", runnable, myActivity); UIUtil.wait("registerUser", runnable, myActivity);
} }
@Override @Override

7
src/org/geometerplus/android/util/UIUtil.java
View file

@ -27,9 +27,9 @@ import android.app.ProgressDialog;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import org.geometerplus.zlibrary.core.dialogs.ZLDialogManager; import org.geometerplus.zlibrary.core.resources.ZLResource;
public abstract class AndroidUtil { public abstract class UIUtil {
private static final Object ourMonitor = new Object(); private static final Object ourMonitor = new Object();
private static ProgressDialog ourProgress; private static ProgressDialog ourProgress;
private static class Pair { private static class Pair {
@ -60,7 +60,8 @@ public abstract class AndroidUtil {
}; };
public static void wait(String key, Runnable action, Context context) { public static void wait(String key, Runnable action, Context context) {
synchronized (ourMonitor) { synchronized (ourMonitor) {
final String message = ZLDialogManager.getWaitMessageText(key); final String message =
ZLResource.resource("dialog").getResource("waitMessage").getResource(key).getValue();
ourTaskQueue.offer(new Pair(action, message)); ourTaskQueue.offer(new Pair(action, message));
if (ourProgress == null) { if (ourProgress == null) {
ourProgress = ProgressDialog.show(context, null, message, true, false); ourProgress = ProgressDialog.show(context, null, message, true, false);

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

@ -37,10 +37,6 @@ public abstract class ZLDialogManager {
public abstract ZLOptionsDialog createOptionsDialog(String key); public abstract ZLOptionsDialog createOptionsDialog(String key);
public abstract void wait(String key, Runnable runnable); public abstract void wait(String key, Runnable runnable);
public static String getWaitMessageText(String key) {
return getResource().getResource("waitMessage").getResource(key).getValue();
}
protected static ZLResource getResource() { protected static ZLResource getResource() {
return ZLResource.resource("dialog"); return ZLResource.resource("dialog");

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

@ -23,7 +23,7 @@ import android.app.*;
import org.geometerplus.zlibrary.core.dialogs.*; import org.geometerplus.zlibrary.core.dialogs.*;
import org.geometerplus.android.util.AndroidUtil; import org.geometerplus.android.util.UIUtil;
public class ZLAndroidDialogManager extends ZLDialogManager { public class ZLAndroidDialogManager extends ZLDialogManager {
private Activity myActivity; private Activity myActivity;
@ -40,6 +40,6 @@ public class ZLAndroidDialogManager extends ZLDialogManager {
} }
public void wait(String key, Runnable action) { public void wait(String key, Runnable action) {
AndroidUtil.wait(key, action, myActivity); UIUtil.wait(key, action, myActivity);
} }
} }