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

DeleteSample menu item

Browse source 
git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1129 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
This commit is contained in:
Vasiliy Bout 2010-03-23 12:36:32 +00:00
parent be383cbc29
commit a10c501103
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TODO.network
View file

@ -1,7 +1,6 @@
DONE нарисовать иконку (скопирована иконка ic_menu_networksearch.png)
DONE переместить в главном меню наверх (вместо Settings)
* пункт меню "delete sample"
DONE пункт меню "delete sample"
* BookDownloaderService - i18n
* указывать HTTP-agent = "FBReader/<version>(java)" -- номер версии смотреть, как в диалоге About
* прятать Profile (прятать запрещенные каталоги)

1
data/resources/application/en.xml
View file

@ -25,6 +25,7 @@
<node name="read" value="Read local copy"/>
<node name="delete" value="Delete local copy"/>
<node name="readDemo" value="Read sample"/>
<node name="deleteDemo" value="Delete sample"/>
<node name="downloadDemo" value="Download sample"/>
<node name="buy" value="Buy (%s)"/>
<node name="openInBrowser" value="Open in browser" />

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

@ -160,6 +160,7 @@ public class NetworkLibraryActivity extends ListActivity implements MenuItem.OnM
BookReference reference = book.reference(BookReference.Type.DOWNLOAD_DEMO);
if (reference.localCopyFileName() != null) {
menu.add(0, READ_DEMO_ITEM_ID, 0, resource.getResource("readDemo").getValue());
menu.add(0, DELETE_DEMO_ITEM_ID, 0, resource.getResource("deleteDemo").getValue());
} else {
menu.add(0, DOWNLOAD_DEMO_ITEM_ID, 0, resource.getResource("downloadDemo").getValue());
}
@ -311,6 +312,7 @@ public class NetworkLibraryActivity extends ListActivity implements MenuItem.OnM
private static final int OPEN_IN_BROWSER_ITEM_ID = 8;
private static final int RELOAD_ITEM_ID = 9;
private static final int DONT_SHOW_ITEM_ID = 10;
private static final int DELETE_DEMO_ITEM_ID = 11;
//private static final int DBG_PRINT_ENTRY_ITEM_ID = 32000;
@ -346,7 +348,10 @@ public class NetworkLibraryActivity extends ListActivity implements MenuItem.OnM
doReadBook(tree, true);
return true;
case DELETE_BOOK_ITEM_ID:
tryToDeleteBook(tree);
tryToDeleteBook(tree, false);
return true;
case DELETE_DEMO_ITEM_ID:
tryToDeleteBook(tree, true);
return true;
case BUY_DIRECTLY_ITEM_ID:
doBuyDirectly(tree);
@ -464,7 +469,7 @@ public class NetworkLibraryActivity extends ListActivity implements MenuItem.OnM
}
}
private void tryToDeleteBook(NetworkTree tree) {
private void tryToDeleteBook(NetworkTree tree, final boolean demo) {
final NetworkBookTree bookTree = (NetworkBookTree) tree;
final NetworkBookItem book = bookTree.Book;
final ZLResource dialogResource = ZLResource.resource("dialog");
@ -477,7 +482,17 @@ public class NetworkLibraryActivity extends ListActivity implements MenuItem.OnM
.setPositiveButton(buttonResource.getResource("yes").getValue(), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
// TODO: remove information about book from Library???
book.removeLocalFiles();
if (!demo) {
book.removeLocalFiles();
} else {
final BookReference reference = book.reference(BookReference.Type.DOWNLOAD_DEMO);
if (reference != null) {
final String fileName = reference.localCopyFileName();
if (fileName != null) {
new File(fileName).delete();
}
}
}
}
})
.setNegativeButton(buttonResource.getResource("no").getValue(), null)