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:
Nikolay Pultsin 2011-07-14 22:15:57 +01:00
parent c7b2cab18b
commit 4ca3322524
1 changed files with 26 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,31 +44,22 @@ import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.fbreader.BookInfoActivity; import org.geometerplus.android.fbreader.BookInfoActivity;
public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItemClickListener { public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItemClickListener {
static final String TREE_KEY_KEY = "TreeKey"; public static final String TREE_KEY_KEY = "TreeKey";
public static final String SELECTED_BOOK_PATH_KEY = "SelectedBookPath"; public static final String SELECTED_BOOK_PATH_KEY = "SelectedBookPath";
protected static final int CHILD_LIST_REQUEST = 0;
protected static final int BOOK_INFO_REQUEST = 1;
protected static final int RESULT_DONT_INVALIDATE_VIEWS = 0;
protected static final int RESULT_DO_INVALIDATE_VIEWS = 1;
static BooksDatabase DatabaseInstance;
static Library LibraryInstance; static Library LibraryInstance;
static final ZLStringOption BookSearchPatternOption = private BooksDatabase myDatabase;
new ZLStringOption("BookSearch", "Pattern", "");
protected String mySelectedBookPath;
private Book mySelectedBook; private Book mySelectedBook;
@Override @Override
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
super.onCreate(icicle); super.onCreate(icicle);
DatabaseInstance = SQLiteBooksDatabase.Instance(); myDatabase = SQLiteBooksDatabase.Instance();
if (DatabaseInstance == null) { if (myDatabase == null) {
DatabaseInstance = new SQLiteBooksDatabase(this, "LIBRARY"); myDatabase = new SQLiteBooksDatabase(this, "LIBRARY");
} }
if (LibraryInstance == null) { if (LibraryInstance == null) {
LibraryInstance = new Library(); LibraryInstance = new Library();
@ -83,10 +74,10 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
); );
setTitle(getCurrentTree().getTreeTitle()); setTitle(getCurrentTree().getTreeTitle());
mySelectedBookPath = getIntent().getStringExtra(SELECTED_BOOK_PATH_KEY); final String selectedBookPath = getIntent().getStringExtra(SELECTED_BOOK_PATH_KEY);
mySelectedBook = null; mySelectedBook = null;
if (mySelectedBookPath != null) { if (selectedBookPath != null) {
final ZLFile file = ZLFile.createFileByPath(mySelectedBookPath); final ZLFile file = ZLFile.createFileByPath(selectedBookPath);
if (file != null) { if (file != null) {
mySelectedBook = Book.getByFile(file); mySelectedBook = Book.getByFile(file);
} }
@ -109,15 +100,6 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
return lTree.isSelectable() && lTree.containsBook(mySelectedBook); return lTree.isSelectable() && lTree.containsBook(mySelectedBook);
} }
protected void openBook(Book book) {
startActivity(
new Intent(getApplicationContext(), FBReader.class)
.setAction(Intent.ACTION_VIEW)
.putExtra(FBReader.BOOK_PATH_KEY, book.File.getPath())
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
);
}
@Override @Override
protected void onListItemClick(ListView listView, View view, int position, long rowId) { protected void onListItemClick(ListView listView, View view, int position, long rowId) {
final LibraryTree tree = (LibraryTree)getListAdapter().getItem(position); final LibraryTree tree = (LibraryTree)getListAdapter().getItem(position);
@ -129,6 +111,11 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
} }
} }
//
// show BookInfoActivity
//
private static final int BOOK_INFO_REQUEST = 1;
protected void showBookInfo(Book book) { protected void showBookInfo(Book book) {
startActivityForResult( startActivityForResult(
new Intent(getApplicationContext(), BookInfoActivity.class) new Intent(getApplicationContext(), BookInfoActivity.class)
@ -139,28 +126,17 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
@Override @Override
protected void onActivityResult(int requestCode, int returnCode, Intent intent) { protected void onActivityResult(int requestCode, int returnCode, Intent intent) {
if (requestCode == CHILD_LIST_REQUEST && returnCode == RESULT_DO_INVALIDATE_VIEWS) { if (requestCode == BOOK_INFO_REQUEST) {
if (getCurrentTree() instanceof FileTree) {
startUpdate();
}
getListView().invalidateViews();
} else if (requestCode == BOOK_INFO_REQUEST) {
getListView().invalidateViews(); getListView().invalidateViews();
} }
} }
private void startUpdate() {
new Thread(new Runnable() {
public void run() {
getCurrentTree().waitForOpening();
getListAdapter().replaceAll(getCurrentTree().subTrees());
}
}).start();
}
// //
// Search // Search
// //
static final ZLStringOption BookSearchPatternOption =
new ZLStringOption("BookSearch", "Pattern", "");
@Override @Override
protected void onNewIntent(Intent intent) { protected void onNewIntent(Intent intent) {
if (Intent.ACTION_SEARCH.equals(intent.getAction())) { if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
@ -263,6 +239,15 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
return false; return false;
} }
private void openBook(Book book) {
startActivity(
new Intent(getApplicationContext(), FBReader.class)
.setAction(Intent.ACTION_VIEW)
.putExtra(FBReader.BOOK_PATH_KEY, book.File.getPath())
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
);
}
// //
// Options menu // Options menu
// //