1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-06 03:50:19 +02:00

Error message for empty favorites list has been added

This commit is contained in:
Nikolay Pultsin 2010-12-17 18:31:35 +00:00
parent e659e69ee0
commit dc2f1f6f4c
13 changed files with 48 additions and 18 deletions

View file

@ -4,7 +4,7 @@
DONE Covers loading in background
DONE Wait messages
DONE Favorites
* Show text if the favorites list is empty
DONE Show text if the favorites list is empty
DONE Search
* Show wait message during search
* File view

View file

@ -538,6 +538,7 @@
<node name="bookmarkNotFound" value="Nejsou bohužel žádné vhodné záložky"/>
<node name="cannotOpenBook" value="Tuto knihu právě teď nelze bohužel otevřít"/>
<node name="permissionDenied" value="Permission denied, sorry" toBeTranslated="true"/>
<node name="noFavorites" value="Your favorites list is empty, sorry" toBeTranslated="true"/>
</node>
<node name="external">
<node name="browser" value="Prohlížeč"/>

View file

@ -539,6 +539,7 @@
<node name="bookmarkNotFound" value="Es wurden kein passenden Lesezeichen gefunden."/>
<node name="cannotOpenBook" value="Das Buch kann zurzeit nicht geöffnet werden."/>
<node name="permissionDenied" value="Permission denied, sorry" toBeTranslated="true"/>
<node name="noFavorites" value="Your favorites list is empty, sorry" toBeTranslated="true"/>
</node>
<node name="external">
<node name="browser" value="Browser"/>

View file

@ -540,6 +540,7 @@
<node name="cannotOpenBook" value="Cannot open this book at the moment, sorry"/>
<node name="dictNotInstalled" value="Supported dictionary is not installed, sorry"/>
<node name="permissionDenied" value="Permission denied, sorry"/>
<node name="noFavorites" value="Your favorites list is empty, sorry"/>
</node>
<node name="external">
<node name="browser" value="Browser"/>

View file

@ -541,6 +541,7 @@
<node name="bookmarkNotFound" value="Aucun marque-page correspondant"/>
<node name="cannotOpenBook" value="Impossible d'ouvrir le livre"/>
<node name="permissionDenied" value="Permission denied, sorry" toBeTranslated="true"/>
<node name="noFavorites" value="Your favorites list is empty, sorry" toBeTranslated="true"/>
</node>
<node name="external">
<node name="browser" value="Navigateur"/>

View file

@ -538,6 +538,7 @@
<node name="bookmarkNotFound" value="Sajnos nem találhatóak könyvjelzők"/>
<node name="cannotOpenBook" value="A könyv sajnos jelenleg nem nyitható meg"/>
<node name="permissionDenied" value="Permission denied, sorry" toBeTranslated="true"/>
<node name="noFavorites" value="Your favorites list is empty, sorry" toBeTranslated="true"/>
</node>
<node name="external">
<node name="browser" value="Böngésző"/>

View file

@ -538,6 +538,7 @@
<node name="bookmarkNotFound" value="Spiacente, non ci sono segnalibri adatti"/>
<node name="cannotOpenBook" value="Spiacente, non è possibile aprire il libro in questo momento"/>
<node name="permissionDenied" value="Permission denied, sorry" toBeTranslated="true"/>
<node name="noFavorites" value="Your favorites list is empty, sorry" toBeTranslated="true"/>
</node>
<node name="external">
<node name="browser" value="Browser"/>

View file

@ -540,6 +540,7 @@
<node name="cannotOpenBook" value="Не удается открыть книгу"/>
<node name="dictNotInstalled" value="Не установлен поддерживаемый словарь"/>
<node name="permissionDenied" value="Нет доступа к файлам" />
<node name="noFavorites" value="Вы пока не добавили ни одной книги в &#171;Избранное&#187;"/>
</node>
<node name="external">
<node name="browser" value="браузере"/>

View file

@ -538,6 +538,7 @@
<node name="bookmarkNotFound" value="Нема відповідних закладок"/>
<node name="cannotOpenBook" value="Невдається відкрити книгу"/>
<node name="permissionDenied" value="Permission denied, sorry" toBeTranslated="true"/>
<node name="noFavorites" value="Your favorites list is empty, sorry" toBeTranslated="true"/>
</node>
<node name="external">
<node name="browser" value="браузері"/>

View file

@ -538,6 +538,7 @@
<node name="bookmarkNotFound" value="Xin lỗi, không có đánh dấu thích hợp"/>
<node name="cannotOpenBook" value="Xin lỗi, không thể mở sách vào lúc này"/>
<node name="permissionDenied" value="Permission denied, sorry" toBeTranslated="true"/>
<node name="noFavorites" value="Your favorites list is empty, sorry" toBeTranslated="true"/>
</node>
<node name="external">
<node name="browser" value="Trình duyệt"/>

View file

@ -538,6 +538,7 @@
<node name="bookmarkNotFound" value="对不起,找不到对应的书签" />
<node name="cannotOpenBook" value="对不起,无法开启本书" />
<node name="permissionDenied" value="Permission denied, sorry" toBeTranslated="true"/>
<node name="noFavorites" value="Your favorites list is empty, sorry" toBeTranslated="true"/>
</node>
<node name="external">
<node name="browser" value="浏览器" />

View file

@ -162,33 +162,44 @@ abstract class LibraryBaseActivity extends BaseActivity {
getListView().invalidateViews();
}
protected class OpenTreeRunnable implements Runnable {
protected class StartTreeActivityRunnable implements Runnable {
private final String myTreePath;
private final String myParameter;
public StartTreeActivityRunnable(String treePath, String parameter) {
myTreePath = treePath;
myParameter = parameter;
}
public void run() {
startActivityForResult(
new Intent(LibraryBaseActivity.this, LibraryTreeActivity.class)
.putExtra(SELECTED_BOOK_PATH_KEY, mySelectedBookPath)
.putExtra(TREE_PATH_KEY, myTreePath)
.putExtra(PARAMETER_KEY, myParameter),
CHILD_LIST_REQUEST
);
}
}
protected class OpenTreeRunnable implements Runnable {
private final Runnable myPostRunnable;
public OpenTreeRunnable(String treePath) {
this(treePath, null);
}
public OpenTreeRunnable(String treePath, String parameter) {
myTreePath = treePath;
myParameter = parameter;
this(new StartTreeActivityRunnable(treePath, parameter));
}
public OpenTreeRunnable(Runnable postRunnable) {
myPostRunnable = postRunnable;
}
public void run() {
final Runnable postRunnable = new Runnable() {
public void run() {
startActivityForResult(
new Intent(LibraryBaseActivity.this, LibraryTreeActivity.class)
.putExtra(SELECTED_BOOK_PATH_KEY, mySelectedBookPath)
.putExtra(TREE_PATH_KEY, myTreePath)
.putExtra(PARAMETER_KEY, myParameter),
CHILD_LIST_REQUEST
);
}
};
if (LibraryInstance.hasState(Library.STATE_FULLY_INITIALIZED)) {
postRunnable.run();
myPostRunnable.run();
} else {
UIUtil.runWithMessage(LibraryBaseActivity.this, "loadingBookList",
new Runnable() {
@ -196,7 +207,7 @@ abstract class LibraryBaseActivity extends BaseActivity {
LibraryInstance.waitForState(Library.STATE_FULLY_INITIALIZED);
}
},
postRunnable);
myPostRunnable);
}
}
}

View file

@ -34,6 +34,7 @@ import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.fbreader.library.Library;
import org.geometerplus.fbreader.tree.FBTree;
import org.geometerplus.android.util.UIUtil;
import org.geometerplus.android.fbreader.SQLiteBooksDatabase;
import org.geometerplus.android.fbreader.tree.ZLAndroidTree;
@ -58,7 +59,15 @@ public class LibraryTopLevelActivity extends LibraryBaseActivity {
myItems.add(new TopLevelTree(
myResource.getResource(PATH_FAVORITES),
R.drawable.ic_list_library_favorites,
new OpenTreeRunnable(PATH_FAVORITES)
new OpenTreeRunnable(new StartTreeActivityRunnable(PATH_FAVORITES, null) {
public void run() {
if (LibraryInstance.favorites().hasChildren()) {
super.run();
} else {
UIUtil.showErrorMessage(LibraryTopLevelActivity.this, "noFavorites");
}
}
})
));
myItems.add(new TopLevelTree(
myResource.getResource(PATH_RECENT),