diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml
index 2b5e0a315..979a022e3 100644
--- a/assets/resources/application/cs.xml
+++ b/assets/resources/application/cs.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml
index c9418ef54..f2839db8e 100644
--- a/assets/resources/application/de.xml
+++ b/assets/resources/application/de.xml
@@ -47,8 +47,8 @@
-
-
+
+
@@ -635,7 +635,7 @@
-
+
diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml
index 9a45e9ba2..d3659139e 100644
--- a/assets/resources/application/en.xml
+++ b/assets/resources/application/en.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml
index 1d55bebad..98ddf112b 100644
--- a/assets/resources/application/fr.xml
+++ b/assets/resources/application/fr.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml
index 2142e5b92..9ce50784d 100644
--- a/assets/resources/application/gl.xml
+++ b/assets/resources/application/gl.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml
index 4e1f0aa36..8525999a2 100644
--- a/assets/resources/application/hu.xml
+++ b/assets/resources/application/hu.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml
index f56450510..7ce36e64d 100644
--- a/assets/resources/application/it.xml
+++ b/assets/resources/application/it.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml
index 1f2f413af..47fae2a91 100644
--- a/assets/resources/application/nl.xml
+++ b/assets/resources/application/nl.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml
index f0445f0d7..2ab5edb4d 100644
--- a/assets/resources/application/ru.xml
+++ b/assets/resources/application/ru.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml
index 1c93c6854..9fa437b11 100644
--- a/assets/resources/application/th.xml
+++ b/assets/resources/application/th.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml
index f5534487d..2f977c953 100644
--- a/assets/resources/application/uk.xml
+++ b/assets/resources/application/uk.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml
index 48fe09c24..de52b3576 100644
--- a/assets/resources/application/vi.xml
+++ b/assets/resources/application/vi.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml
index cf08df3d9..f21eeeced 100644
--- a/assets/resources/application/zh.xml
+++ b/assets/resources/application/zh.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml
index 107685b53..fe3f554e5 100644
--- a/assets/resources/application/zh_TW.xml
+++ b/assets/resources/application/zh_TW.xml
@@ -44,7 +44,7 @@
-
+
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java
index 2329dcae6..3b53717f1 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java
@@ -28,7 +28,6 @@ import android.graphics.Bitmap;
import org.geometerplus.zlibrary.ui.android.R;
-import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.image.ZLImage;
import org.geometerplus.zlibrary.core.image.ZLLoadableImage;
@@ -47,8 +46,6 @@ abstract class NetworkBaseActivity extends ListActivity implements NetworkView.E
protected static final int CUSTOM_AUTHENTICATION_CODE = 2;
protected static final int SIGNUP_CODE = 3;
- protected final ZLResource myResource = ZLResource.resource("networkView");
-
public BookDownloaderServiceConnection Connection;
private FBTree myCurrentTree;
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
index f3f607d0e..2534bbb5d 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
@@ -309,7 +309,7 @@ public class NetworkBookInfoActivity extends Activity implements NetworkView.Eve
}
private final void setupButtons() {
- final ZLResource resource = ZLResource.resource("networkView");
+ final ZLResource resource = NetworkLibrary.resource();
final int buttons[] = new int[] {
R.id.network_book_button0,
R.id.network_book_button1,
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
index cec59d5f0..e200b75b6 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
@@ -232,7 +232,7 @@ class NetworkCatalogActions extends NetworkTreeActions {
case OPEN_IN_BROWSER_ITEM_ID:
if (item instanceof NetworkURLCatalogItem) {
final ZLResource buttonResource = ZLResource.resource("dialog").getResource("button");
- final String message = myResource.getResource("confirmQuestions").getResource("openInBrowser").getValue();
+ final String message = NetworkLibrary.resource().getResource("confirmQuestions").getResource("openInBrowser").getValue();
new AlertDialog.Builder(activity)
.setTitle(catalogTree.getName())
.setMessage(message)
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
index 17751ee9c..de9fa4c53 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkLibraryActivity.java
@@ -179,7 +179,7 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
protected MenuItem addMenuItem(Menu menu, int index, String resourceKey, int iconId) {
- final String label = myResource.getResource("menu").getResource(resourceKey).getValue();
+ final String label = NetworkLibrary.resource().getResource("menu").getResource(resourceKey).getValue();
return menu.add(0, index, Menu.NONE, label).setIcon(iconId);
}
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java b/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java
index 1b246df16..afffbe009 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java
@@ -142,7 +142,7 @@ public class NetworkSearchActivity extends Activity {
return;
}
- final String summary = ZLResource.resource("networkView").getResource("searchResults").getValue().replace("%s", pattern);
+ final String summary = NetworkLibrary.resource().getResource("searchResults").getValue().replace("%s", pattern);
final SearchResult result = new SearchResult(summary);
tree.setSearchResult(result);
diff --git a/src/org/geometerplus/android/fbreader/network/NetworkTreeActions.java b/src/org/geometerplus/android/fbreader/network/NetworkTreeActions.java
index 3c78ca5c7..7113e75fa 100644
--- a/src/org/geometerplus/android/fbreader/network/NetworkTreeActions.java
+++ b/src/org/geometerplus/android/fbreader/network/NetworkTreeActions.java
@@ -24,34 +24,28 @@ import android.view.Menu;
import android.view.ContextMenu;
import android.view.MenuItem;
-import org.geometerplus.zlibrary.core.resources.ZLResource;
-
+import org.geometerplus.fbreader.network.NetworkLibrary;
import org.geometerplus.fbreader.network.NetworkTree;
-
abstract class NetworkTreeActions {
-
// special values to return from getDefaultActionCode(NetworkTree)
public static final int TREE_NO_ACTION = -1;
public static final int TREE_SHOW_CONTEXT_MENU = -2;
-
- protected final ZLResource myResource = ZLResource.resource("networkView");
-
protected final String getTitleValue(String key) {
- return myResource.getResource(key).getValue();
+ return NetworkLibrary.resource().getResource(key).getValue();
}
protected final String getTitleValue(String key, String arg) {
- return myResource.getResource(key).getValue().replace("%s", arg);
+ return NetworkLibrary.resource().getResource(key).getValue().replace("%s", arg);
}
protected final String getOptionsValue(String key) {
- return myResource.getResource("menu").getResource(key).getValue();
+ return NetworkLibrary.resource().getResource("menu").getResource(key).getValue();
}
protected final String getOptionsValue(String key, String arg) {
- return myResource.getResource("menu").getResource(key).getValue().replace("%s", arg);
+ return NetworkLibrary.resource().getResource("menu").getResource(key).getValue().replace("%s", arg);
}
protected final MenuItem addMenuItem(ContextMenu menu, int id, String key) {
diff --git a/src/org/geometerplus/fbreader/network/NetworkLibrary.java b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
index 273872b46..4c4bd7703 100644
--- a/src/org/geometerplus/fbreader/network/NetworkLibrary.java
+++ b/src/org/geometerplus/fbreader/network/NetworkLibrary.java
@@ -28,6 +28,7 @@ import org.geometerplus.zlibrary.core.network.ZLNetworkManager;
import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.core.network.ZLNetworkRequest;
import org.geometerplus.zlibrary.core.language.ZLLanguageUtil;
+import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.fbreader.tree.FBTree;
import org.geometerplus.fbreader.network.tree.*;
@@ -44,6 +45,10 @@ public class NetworkLibrary {
return ourInstance;
}
+ public static ZLResource resource() {
+ return ZLResource.resource("networkLibrary");
+ }
+
private static class LinksComparator implements Comparator {
private static String filterLinkTitle(String title) {
for (int index = 0; index < title.length(); ++index) {
diff --git a/src/org/geometerplus/fbreader/network/TopUpItem.java b/src/org/geometerplus/fbreader/network/TopUpItem.java
index 9b4c9015e..8f636b7b0 100644
--- a/src/org/geometerplus/fbreader/network/TopUpItem.java
+++ b/src/org/geometerplus/fbreader/network/TopUpItem.java
@@ -27,8 +27,8 @@ public class TopUpItem extends NetworkItem {
public TopUpItem(INetworkLink link, UrlInfoCollection urls) {
super(
link,
- ZLResource.resource("networkView").getResource("topupTitle").getValue(),
- ZLResource.resource("networkView").getResource("topupSummary").getValue(),
+ NetworkLibrary.resource().getResource("topupTitle").getValue(),
+ NetworkLibrary.resource().getResource("topupSummary").getValue(),
urls
);
}
diff --git a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
index ae7066b73..28ae3954a 100644
--- a/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
+++ b/src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
@@ -53,7 +53,7 @@ abstract class SortedCatalogItem extends NetworkCatalogItem {
}
public SortedCatalogItem(NetworkCatalogItem parent, String resourceKey, List children, int flags) {
- this(parent, ZLResource.resource("networkView").getResource(resourceKey), children, flags);
+ this(parent, NetworkLibrary.resource().getResource(resourceKey), children, flags);
}
@Override
diff --git a/src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java b/src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java
index 8d6d3097d..d8534165a 100644
--- a/src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java
+++ b/src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java
@@ -19,10 +19,7 @@
package org.geometerplus.fbreader.network.tree;
-import org.geometerplus.zlibrary.core.resources.ZLResource;
-
-import org.geometerplus.fbreader.network.NetworkItem;
-import org.geometerplus.fbreader.network.NetworkTree;
+import org.geometerplus.fbreader.network.*;
public class AddCustomCatalogItemTree extends NetworkTree {
public AddCustomCatalogItemTree(NetworkTree parent) {
@@ -31,12 +28,12 @@ public class AddCustomCatalogItemTree extends NetworkTree {
@Override
public String getName() {
- return ZLResource.resource("networkView").getResource("addCustomCatalog").getValue();
+ return NetworkLibrary.resource().getResource("addCustomCatalog").getValue();
}
@Override
public String getSummary() {
- return ZLResource.resource("networkView").getResource("addCustomCatalogSummary").getValue();
+ return NetworkLibrary.resource().getResource("addCustomCatalogSummary").getValue();
}
@Override
diff --git a/src/org/geometerplus/fbreader/network/tree/RootTree.java b/src/org/geometerplus/fbreader/network/tree/RootTree.java
index fdf6725a7..da9dbca46 100644
--- a/src/org/geometerplus/fbreader/network/tree/RootTree.java
+++ b/src/org/geometerplus/fbreader/network/tree/RootTree.java
@@ -19,8 +19,7 @@
package org.geometerplus.fbreader.network.tree;
-import org.geometerplus.fbreader.network.NetworkItem;
-import org.geometerplus.fbreader.network.NetworkTree;
+import org.geometerplus.fbreader.network.*;
public final class RootTree extends NetworkTree {
private final String myId;
@@ -31,7 +30,7 @@ public final class RootTree extends NetworkTree {
@Override
public String getName() {
- return null;
+ return NetworkLibrary.resource().getValue();
}
@Override
diff --git a/src/org/geometerplus/fbreader/network/tree/SearchItemTree.java b/src/org/geometerplus/fbreader/network/tree/SearchItemTree.java
index 0e7ccf8b5..d5e06e7d9 100644
--- a/src/org/geometerplus/fbreader/network/tree/SearchItemTree.java
+++ b/src/org/geometerplus/fbreader/network/tree/SearchItemTree.java
@@ -23,8 +23,6 @@ import java.util.Set;
import java.util.LinkedList;
import java.util.ListIterator;
-import org.geometerplus.zlibrary.core.resources.ZLResource;
-
import org.geometerplus.fbreader.tree.FBTree;
import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.tree.NetworkAuthorTree;
@@ -38,12 +36,12 @@ public class SearchItemTree extends NetworkTree {
@Override
public String getName() {
- return ZLResource.resource("networkView").getResource("search").getValue();
+ return NetworkLibrary.resource().getResource("search").getValue();
}
@Override
public String getSummary() {
- return ZLResource.resource("networkView").getResource("searchSummary").getValue();
+ return NetworkLibrary.resource().getResource("searchSummary").getValue();
}
@Override