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

Code cleanup

Browse source
This commit is contained in:
Vasiliy Bout 2010-12-10 16:58:23 +03:00
parent 3f07c2924a
commit f29380ac4b
14 changed files with 42 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/org/geometerplus/android/fbreader/library/LibraryBaseActivity.java
View file

@ -25,8 +25,6 @@ import android.app.*;
import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.util.Log;
import android.os.*;
import android.view.*;
import android.widget.*;
@ -59,7 +57,7 @@ abstract class LibraryBaseActivity extends ListActivity {
static final String PATH_BY_AUTHOR = "byAuthor";
static final String PATH_BY_TAG = "byTag";
static Library Library;
static Library LibraryInstance;
static final ZLStringOption BookSearchPatternOption =
new ZLStringOption("BookSearch", "Pattern", "");
@ -88,7 +86,7 @@ abstract class LibraryBaseActivity extends ListActivity {
return false;
}
BookSearchPatternOption.setValue(pattern);
return Library.searchBooks(pattern).hasChildren();
return LibraryInstance.searchBooks(pattern).hasChildren();
}
protected void showNotFoundToast() {
@ -124,12 +122,12 @@ abstract class LibraryBaseActivity extends ListActivity {
if (tree instanceof BookTree) {
menu.setHeaderTitle(tree.getName());
menu.add(0, OPEN_BOOK_ITEM_ID, 0, myResource.getResource("openBook").getValue());
if (Library.isBookInFavorites(((BookTree)tree).Book)) {
if (LibraryInstance.isBookInFavorites(((BookTree)tree).Book)) {
menu.add(0, REMOVE_FROM_FAVORITES_ITEM_ID, 0, myResource.getResource("removeFromFavorites").getValue());
} else {
menu.add(0, ADD_TO_FAVORITES_ITEM_ID, 0, myResource.getResource("addToFavorites").getValue());
}
if ((Library.getRemoveBookMode(((BookTree)tree).Book) & Library.REMOVE_FROM_DISK) != 0) {
if ((LibraryInstance.getRemoveBookMode(((BookTree)tree).Book) & Library.REMOVE_FROM_DISK) != 0) {
menu.add(0, DELETE_BOOK_ITEM_ID, 0, myResource.getResource("deleteBook").getValue());
}
}
@ -229,10 +227,10 @@ abstract class LibraryBaseActivity extends ListActivity {
openBook(bookTree.Book);
return true;
case ADD_TO_FAVORITES_ITEM_ID:
Library.addBookToFavorites(bookTree.Book);
LibraryInstance.addBookToFavorites(bookTree.Book);
return true;
case REMOVE_FROM_FAVORITES_ITEM_ID:
Library.removeBookFromFavorites(bookTree.Book);
LibraryInstance.removeBookFromFavorites(bookTree.Book);
getListView().invalidateViews();
return true;
case DELETE_BOOK_ITEM_ID:
@ -269,13 +267,13 @@ abstract class LibraryBaseActivity extends ListActivity {
);
}
};
if (Library.hasState(Library.STATE_FULLY_INITIALIZED)) {
if (LibraryInstance.hasState(Library.STATE_FULLY_INITIALIZED)) {
postRunnable.run();
} else {
UIUtil.runWithMessage(LibraryBaseActivity.this, "loadingBookList",
new Runnable() {
public void run() {
Library.waitForState(Library.STATE_FULLY_INITIALIZED);
LibraryInstance.waitForState(Library.STATE_FULLY_INITIALIZED);
}
},
postRunnable);