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

NG library view (in progress)

Browse source
This commit is contained in:
Nikolay Pultsin 2010-11-21 16:32:39 +00:00
parent a2f799f29b
commit 1e9396d5c2
5 changed files with 72 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -77,7 +77,7 @@
<activity android:name="org.geometerplus.android.fbreader.LibraryTabActivity" android:process=":library" android:configChanges="orientation|keyboardHidden">
<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.BookSearchActivity" />
</activity>
<activity android:name="org.geometerplus.android.fbreader.library.LibraryBaseActivity" android:process=":library" android:configChanges="orientation|keyboardHidden">
<activity android:name="org.geometerplus.android.fbreader.library.LibraryTopLevelActivity" android:process=":library" android:configChanges="orientation|keyboardHidden">
<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.BookSearchActivity" />
</activity>
<activity android:name="org.geometerplus.android.fbreader.TOCActivity" android:configChanges="orientation|keyboardHidden" />

2
AndroidManifest.xml.pattern
View file

@ -77,7 +77,7 @@
<activity android:name="org.geometerplus.android.fbreader.LibraryTabActivity" android:process=":library" android:configChanges="orientation|keyboardHidden">
<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.BookSearchActivity" />
</activity>
<activity android:name="org.geometerplus.android.fbreader.library.LibraryBaseActivity" android:process=":library" android:configChanges="orientation|keyboardHidden">
<activity android:name="org.geometerplus.android.fbreader.library.LibraryTopLevelActivity" android:process=":library" android:configChanges="orientation|keyboardHidden">
<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.BookSearchActivity" />
</activity>
<activity android:name="org.geometerplus.android.fbreader.TOCActivity" android:configChanges="orientation|keyboardHidden" />

6
src/org/geometerplus/android/fbreader/ShowLibraryAction.java
View file

@ -27,7 +27,7 @@ import org.geometerplus.fbreader.fbreader.FBAction;
import org.geometerplus.fbreader.fbreader.FBReaderApp;
import org.geometerplus.fbreader.bookmodel.BookModel;
import org.geometerplus.android.fbreader.library.LibraryBaseActivity;
import org.geometerplus.android.fbreader.library.LibraryTopLevelActivity;
class ShowLibraryAction extends FBAction {
private final FBReader myBaseActivity;
@ -39,9 +39,9 @@ class ShowLibraryAction extends FBAction {
public void run() {
final BookModel model = Reader.Model;
Intent intent = new Intent(myBaseActivity.getApplicationContext(), LibraryBaseActivity.class);
Intent intent = new Intent(myBaseActivity.getApplicationContext(), LibraryTopLevelActivity.class);
if (model != null && model.Book != null) {
//intent.putExtra(LibraryBaseActivity.CURRENT_BOOK_PATH_KEY, model.Book.File.getPath());
//intent.putExtra(LibraryTopLevelActivity.CURRENT_BOOK_PATH_KEY, model.Book.File.getPath());
}
myBaseActivity.startActivity(intent);
}

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

@ -19,7 +19,7 @@
package org.geometerplus.android.fbreader.library;
import java.util.ArrayList;
import java.util.List;
import android.app.ListActivity;
import android.os.Bundle;
@ -33,27 +33,22 @@ import org.geometerplus.fbreader.tree.FBTree;
import org.geometerplus.zlibrary.ui.android.R;
public class LibraryBaseActivity extends ListActivity {
private final ZLResource myResource = ZLResource.resource("libraryView");
protected final ZLResource myResource = ZLResource.resource("libraryView");
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
setListAdapter(new LibraryAdapter());
}
@Override
public void onListItemClick(ListView listView, View view, int position, long rowId) {
}
private final class LibraryAdapter extends BaseAdapter {
private final ArrayList<TopLevelTree> myItems = new ArrayList<TopLevelTree>();
protected final class LibraryAdapter extends BaseAdapter {
private final List<FBTree> myItems;
public LibraryAdapter() {
myItems.add(new TopLevelTree(myResource.getResource("searchResults")));
myItems.add(new TopLevelTree(myResource.getResource("recent")));
myItems.add(new TopLevelTree(myResource.getResource("byAuthor")));
myItems.add(new TopLevelTree(myResource.getResource("byTag")));
myItems.add(new TopLevelTree(myResource.getResource("fileTree")));
public LibraryAdapter(List<FBTree> items) {
myItems = items;
}
@Override
@ -71,9 +66,6 @@ public class LibraryBaseActivity extends ListActivity {
return position;
}
//private ZLImage myFBReaderIcon =
// ZLAndroidLibrary.Instance().createImage(R.drawable.fbreader);
private int myCoverWidth = -1;
private int myCoverHeight = -1;
@ -109,9 +101,6 @@ public class LibraryBaseActivity extends ListActivity {
private void setupCover(final ImageView coverView, FBTree tree, int width, int height) {
Bitmap coverBitmap = null;
ZLImage cover = tree.getCover();
if (cover == null) {
cover = myFBReaderIcon;
}
if (cover != null) {
ZLAndroidImageData data = null;
final ZLAndroidImageManager mgr = (ZLAndroidImageManager) ZLAndroidImageManager.Instance();
@ -123,26 +112,8 @@ public class LibraryBaseActivity extends ListActivity {
if (coverBitmap != null) {
coverView.setImageBitmap(coverBitmap);
} else {
coverView.setImageDrawable(null);
coverView.setImageResource(R.drawable.fbreader);
}
}
*/
}
class TopLevelTree extends FBTree {
private final ZLResource myResource;
public TopLevelTree(ZLResource resource) {
myResource = resource;
}
@Override
public String getName() {
return myResource.getValue();
}
@Override
public String getSummary() {
return myResource.getResource("summary").getValue();
}
}

60
src/org/geometerplus/android/fbreader/library/LibraryTopLevelActivity.java Normal file
View file

@ -0,0 +1,60 @@
/*
* Copyright (C) 2010 Geometer Plus <contact@geometerplus.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
package org.geometerplus.android.fbreader.library;
import java.util.ArrayList;
import android.os.Bundle;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.fbreader.tree.FBTree;
public class LibraryTopLevelActivity extends LibraryBaseActivity {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
final ArrayList<FBTree> items = new ArrayList<FBTree>();
items.add(new TopLevelTree(myResource.getResource("searchResults")));
items.add(new TopLevelTree(myResource.getResource("recent")));
items.add(new TopLevelTree(myResource.getResource("byAuthor")));
items.add(new TopLevelTree(myResource.getResource("byTag")));
items.add(new TopLevelTree(myResource.getResource("fileTree")));
setListAdapter(new LibraryAdapter(items));
}
}
class TopLevelTree extends FBTree {
private final ZLResource myResource;
public TopLevelTree(ZLResource resource) {
myResource = resource;
}
@Override
public String getName() {
return myResource.getValue();
}
@Override
public String getSummary() {
return myResource.getResource("summary").getValue();
}
}