From dc2f1f6f4ce06ea973bf5538cf95f69183479e90 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Fri, 17 Dec 2010 18:31:35 +0000
Subject: [PATCH] Error message for empty favorites list has been added

---
 TODO.library                                  |  2 +-
 assets/resources/application/cs.xml           |  1 +
 assets/resources/application/de.xml           |  1 +
 assets/resources/application/en.xml           |  1 +
 assets/resources/application/fr.xml           |  1 +
 assets/resources/application/hu.xml           |  1 +
 assets/resources/application/it.xml           |  1 +
 assets/resources/application/ru.xml           |  1 +
 assets/resources/application/uk.xml           |  1 +
 assets/resources/application/vi.xml           |  1 +
 assets/resources/application/zh.xml           |  1 +
 .../fbreader/library/LibraryBaseActivity.java | 43 ++++++++++++-------
 .../library/LibraryTopLevelActivity.java      | 11 ++++-
 13 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/TODO.library b/TODO.library
index 75b1e9cee..d980a921a 100644
--- a/TODO.library
+++ b/TODO.library
@@ -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
diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml
index c999cd46a..f365e5889 100644
--- a/assets/resources/application/cs.xml
+++ b/assets/resources/application/cs.xml
@@ -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č"/>
diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml
index 8228dee94..0d627792f 100644
--- a/assets/resources/application/de.xml
+++ b/assets/resources/application/de.xml
@@ -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"/>
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index d494be59a..d0d5297ba 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -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"/>
diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml
index 74b88fc23..fe787ad00 100644
--- a/assets/resources/application/fr.xml
+++ b/assets/resources/application/fr.xml
@@ -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"/>
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index 6beab5ba9..8753a70c7 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -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ő"/>
diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml
index f0a6be9e6..e2e10104b 100644
--- a/assets/resources/application/it.xml
+++ b/assets/resources/application/it.xml
@@ -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"/>
diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml
index 583efb994..46394b03c 100644
--- a/assets/resources/application/ru.xml
+++ b/assets/resources/application/ru.xml
@@ -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="браузере"/>
diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml
index 3b160595f..318d8e021 100644
--- a/assets/resources/application/uk.xml
+++ b/assets/resources/application/uk.xml
@@ -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="браузері"/>
diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml
index 5623e8522..32ea8759e 100644
--- a/assets/resources/application/vi.xml
+++ b/assets/resources/application/vi.xml
@@ -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"/>
diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml
index 8eeb9df85..232a7bf72 100644
--- a/assets/resources/application/zh.xml
+++ b/assets/resources/application/zh.xml
@@ -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="浏览器" />
diff --git a/src/org/geometerplus/android/fbreader/library/LibraryBaseActivity.java b/src/org/geometerplus/android/fbreader/library/LibraryBaseActivity.java
index d9afa5947..b7e02fedf 100644
--- a/src/org/geometerplus/android/fbreader/library/LibraryBaseActivity.java
+++ b/src/org/geometerplus/android/fbreader/library/LibraryBaseActivity.java
@@ -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);
 			}
 		}
 	}
diff --git a/src/org/geometerplus/android/fbreader/library/LibraryTopLevelActivity.java b/src/org/geometerplus/android/fbreader/library/LibraryTopLevelActivity.java
index da5feb3ab..9d8ab8105 100644
--- a/src/org/geometerplus/android/fbreader/library/LibraryTopLevelActivity.java
+++ b/src/org/geometerplus/android/fbreader/library/LibraryTopLevelActivity.java
@@ -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),