yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-04 18:29:23 +02:00
Code Issues Releases Wiki Activity

code unification between library & network library (in progress)

Browse source
This commit is contained in:
Nikolay Pultsin 2011-07-15 20:49:22 +01:00
parent f0a082c3f9
commit 3130b83204
26 changed files with 40 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/resources/application/cs.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Přidat do oblíbených"/>
<node name="removeFromFavorites" value="Odebrat z oblíbených"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="Podle autora">
<node name="summary" value="Knihy seřazeny podle autora"/>
</node>

6
assets/resources/application/de.xml
View file

@ -47,8 +47,8 @@
<node name="addToFavorites" value="Buch zu den Favoriten hinzufügen"/>
<node name="removeFromFavorites" value="Buch aus der Favoritenliste löschen"/>
</node>
<node name="networkView">
<node name="byAuthor" value="Nach Autoren gruppiert">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="Nach Autoren gruppiert">
<node name="summary" value="Bücher nach Autoren auswählen"/>
</node>
<node name="byTitle" value="Nach Titel sortiert">
@ -635,7 +635,7 @@
<node name="catalogTitle" value="Titel"/>
<node name="catalogUrl" value="URL"/>
<node name="catalogSummary" value="Zusammenfassung"/>
<node name="catalogTitleExample" value="Z.B.: Katalog Project Gutenberg."/>
<node name="catalogTitleExample" value="Z.B.: Katalog Project Gutenberg."/>
<node name="catalogUrlExample" alue="Z.B.: http://m.gutenberg.org/"/>
<node name="catalogSummaryExample" value="Z.B.: Public Domain Bücher."/>
<node name="titleIsEmpty" value="Der Titel sollte nicht leer sein."/>

2
assets/resources/application/en.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Add to favorites"/>
<node name="removeFromFavorites" value="Remove from favorites"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library">
<node name="byAuthor" value="By author">
<node name="summary" value="Books sorted by author"/>
</node>

2
assets/resources/application/fr.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Ajouter aux favoris"/>
<node name="removeFromFavorites" value="Supprimer des favoris"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="Par auteur">
<node name="summary" value="Livres triés par auteur"/>
</node>

2
assets/resources/application/gl.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Engadir a preferidos"/>
<node name="removeFromFavorites" value="Retirar de preferidos"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="Por autor">
<node name="summary" value="Libros ordenados por autor"/>
</node>

2
assets/resources/application/hu.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Hozzáadás a kedvencekhez"/>
<node name="removeFromFavorites" value="Eltávolítás a kedvencek közül"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="Szerzők">
<node name="summary" value="Könyvek szerzők szerint"/>
</node>

2
assets/resources/application/it.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Add to favorites" toBeTranslated="true"/>
<node name="removeFromFavorites" value="Remove from favorites" toBeTranslated="true"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="Per autore">
<node name="summary" value="Books sorted by author" toBeTranslated="true"/>
</node>

2
assets/resources/application/nl.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Toevoegen aan favorieten"/>
<node name="removeFromFavorites" value="Verwijderen van favorieten"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="Auteurs">
<node name="summary" value="Boeken gesorteerd op auteur"/>
</node>

2
assets/resources/application/ru.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Добавить в избранное"/>
<node name="removeFromFavorites" value="Убрать из избранного"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader: сетевая библиотека">
<node name="byAuthor" value="Авторы">
<node name="summary" value="Книги, разложенные по авторам"/>
</node>

2
assets/resources/application/th.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="เพิ่มเป็นหนังสือเล่มโปรด"/>
<node name="removeFromFavorites" value="ลบจากหนังสือเล่มโปรด"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="ชื่อผู้แต่ง ">
<node name="summary" value="เรียงตามชื่อผู้แต่ง"/>
</node>

2
assets/resources/application/uk.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Add to favorites" toBeTranslated="true"/>
<node name="removeFromFavorites" value="Remove from favorites" toBeTranslated="true"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="Автори">
<node name="summary" value="Books sorted by author" toBeTranslated="true"/>
</node>

2
assets/resources/application/vi.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="Thêm vào yêu thích"/>
<node name="removeFromFavorites" value="Xóa khỏi yêu thích"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="Theo tác giả">
<node name="summary" value="Sách được xếp theo tác giả"/>
</node>

2
assets/resources/application/zh.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="收藏"/>
<node name="removeFromFavorites" value="从收藏中移除"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="作者">
<node name="summary" value="按作者排序" />
</node>

2
assets/resources/application/zh_TW.xml
View file

@ -44,7 +44,7 @@
<node name="addToFavorites" value="收藏"/>
<node name="removeFromFavorites" value="從收藏中移除"/>
</node>
<node name="networkView">
<node name="networkLibrary" value="FBReader network library" toBeTranslated="true">
<node name="byAuthor" value="作者">
<node name="summary" value="以作者排序"/>
</node>

3
src/org/geometerplus/android/fbreader/network/NetworkBaseActivity.java
View file

@ -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;

2
src/org/geometerplus/android/fbreader/network/NetworkBookInfoActivity.java
View file

@ -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,

2
src/org/geometerplus/android/fbreader/network/NetworkCatalogActions.java
View file

@ -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)

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

@ -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);
}

2
src/org/geometerplus/android/fbreader/network/NetworkSearchActivity.java
View file

@ -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);

16
src/org/geometerplus/android/fbreader/network/NetworkTreeActions.java
View file

@ -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) {

5
src/org/geometerplus/fbreader/network/NetworkLibrary.java
View file

@ -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<INetworkLink> {
private static String filterLinkTitle(String title) {
for (int index = 0; index < title.length(); ++index) {

4
src/org/geometerplus/fbreader/network/TopUpItem.java
View file

@ -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
);
}

2
src/org/geometerplus/fbreader/network/authentication/litres/LitResBookshelfItem.java
View file

@ -53,7 +53,7 @@ abstract class SortedCatalogItem extends NetworkCatalogItem {
}
public SortedCatalogItem(NetworkCatalogItem parent, String resourceKey, List<NetworkItem> children, int flags) {
this(parent, ZLResource.resource("networkView").getResource(resourceKey), children, flags);
this(parent, NetworkLibrary.resource().getResource(resourceKey), children, flags);
}
@Override

9
src/org/geometerplus/fbreader/network/tree/AddCustomCatalogItemTree.java
View file

@ -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

5
src/org/geometerplus/fbreader/network/tree/RootTree.java
View file

@ -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

6
src/org/geometerplus/fbreader/network/tree/SearchItemTree.java
View file

@ -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