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

"abstract" classes moved to a separate directory

Browse source
This commit is contained in:
Nikolay Pultsin 2011-07-14 23:23:20 +01:00
parent d6deb13152
commit e0626bc84a
4 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,9 @@ import org.geometerplus.android.fbreader.SQLiteBooksDatabase;
import org.geometerplus.android.fbreader.FBReader; import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.fbreader.BookInfoActivity; import org.geometerplus.android.fbreader.BookInfoActivity;
import org.geometerplus.android.fbreader.tree.BaseActivity;
import org.geometerplus.android.fbreader.tree.ListAdapter;
public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItemClickListener { public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItemClickListener {
public 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";
@ -95,7 +98,7 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
} }
@Override @Override
boolean isTreeSelected(FBTree tree) { public boolean isTreeSelected(FBTree tree) {
final LibraryTree lTree = (LibraryTree)tree; final LibraryTree lTree = (LibraryTree)tree;
return lTree.isSelectable() && lTree.containsBook(mySelectedBook); return lTree.isSelectable() && lTree.containsBook(mySelectedBook);
} }
@ -280,7 +283,7 @@ public class LibraryActivity extends BaseActivity implements MenuItem.OnMenuItem
// Item icons // Item icons
// //
@Override @Override
protected int getCoverResourceId(FBTree tree) { public int getCoverResourceId(FBTree tree) {
if (((LibraryTree)tree).getBook() != null) { if (((LibraryTree)tree).getBook() != null) {
return R.drawable.ic_list_library_book; return R.drawable.ic_list_library_book;
} else if (tree instanceof FirstLevelTree) { } else if (tree instanceof FirstLevelTree) {

3
src/org/geometerplus/android/fbreader/library/LibraryListAdapter.java
View file

@ -34,6 +34,9 @@ import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.tree.FBTree;
import org.geometerplus.android.fbreader.tree.BaseActivity;
import org.geometerplus.android.fbreader.tree.ListAdapter;
class LibraryListAdapter extends ListAdapter { class LibraryListAdapter extends ListAdapter {
LibraryListAdapter(BaseActivity activity, List<FBTree> items) { LibraryListAdapter(BaseActivity activity, List<FBTree> items) {
super(activity, items); super(activity, items);

8
src/org/geometerplus/android/fbreader/library/BaseActivity.java → src/org/geometerplus/android/fbreader/tree/BaseActivity.java
View file

@ -17,7 +17,7 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.android.fbreader.library; package org.geometerplus.android.fbreader.tree;
import android.app.ListActivity; import android.app.ListActivity;
import android.content.Intent; import android.content.Intent;
@ -29,7 +29,7 @@ import org.geometerplus.android.util.UIUtil;
import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.tree.FBTree;
abstract class BaseActivity extends ListActivity implements View.OnCreateContextMenuListener { public abstract class BaseActivity extends ListActivity implements View.OnCreateContextMenuListener {
private FBTree myCurrentTree; private FBTree myCurrentTree;
@Override @Override
@ -53,8 +53,8 @@ abstract class BaseActivity extends ListActivity implements View.OnCreateContext
myCurrentTree = tree; myCurrentTree = tree;
} }
protected abstract int getCoverResourceId(FBTree tree); public abstract int getCoverResourceId(FBTree tree);
abstract boolean isTreeSelected(FBTree tree); public abstract boolean isTreeSelected(FBTree tree);
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {

15
src/org/geometerplus/android/fbreader/library/ListAdapter.java → src/org/geometerplus/android/fbreader/tree/ListAdapter.java
View file

@ -17,20 +17,11 @@
* 02110-1301, USA. * 02110-1301, USA.
*/ */
package org.geometerplus.android.fbreader.library; package org.geometerplus.android.fbreader.tree;
import java.util.*; import java.util.*;
import android.graphics.Bitmap; import android.widget.BaseAdapter;
import android.view.*;
import android.widget.*;
import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.zlibrary.core.image.ZLLoadableImage;
import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData;
import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageManager;
import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.fbreader.tree.FBTree; import org.geometerplus.fbreader.tree.FBTree;
@ -38,7 +29,7 @@ public abstract class ListAdapter extends BaseAdapter {
private final BaseActivity myActivity; private final BaseActivity myActivity;
private final List<FBTree> myItems; private final List<FBTree> myItems;
ListAdapter(BaseActivity activity, List<FBTree> items) { protected ListAdapter(BaseActivity activity, List<FBTree> items) {
myActivity = activity; myActivity = activity;
myItems = Collections.synchronizedList(new ArrayList<FBTree>(items)); myItems = Collections.synchronizedList(new ArrayList<FBTree>(items));
activity.setListAdapter(this); activity.setListAdapter(this);