Some Network changes

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@1638 6a642e6f-84f6-412e-ac94-c4a38d5a04b0

TODO.network

@@ -2,10 +2,10 @@
 ** Записать изменения в ChangeLog
 
 ---
-** Иконка к "Добавить каталог"
+DONE Иконка к "Добавить каталог"
-** Комментарий к этому пункту = "Добавление OPDS-каталога вручную"
+DONE Комментарий к этому пункту = "Добавление OPDS-каталога вручную"
 ** Какую-нибудь иконку к добавленным вручную каталогам
-** Звездочку к 2-м обязательным пунктам при добавлении каталога
+DONE Звездочку к 2-м обязательным пунктам при добавлении каталога
 ?? Убрать 3-й пункт при добавлении????
 ** Может быть сделать примеры мелким шрифтом под полями???
 ** Сразу (по нажатию Ok) проверять и говорить, верный ли URL (Ex: Это не OPDS-каталог)

data/resources/application/de.xml

@@ -46,6 +46,7 @@
 		<node name="editCustomCatalog" toBeTranslated="true" value="Edit catalog"/>
 		<node name="removeCustomCatalog" toBeTranslated="true" value="Remove catalog"/>
 		<node name="addCustomCatalog" toBeTranslated="true" value="Add catalog"/>
+		<node name="addCustomCatalogSummary" toBeTranslated="true" value="Add custom OPDS catalog manually"/>
 		<node name="confirmQuestions">
 			<node name="read" value="Willst du die lokale Kopie lesen?"/>
 			<node name="download" value="Willst du dieses Buch downloaden?"/>

data/resources/application/en.xml

@@ -45,6 +45,7 @@
 		<node name="editCustomCatalog" value="Edit catalog"/>
 		<node name="removeCustomCatalog" value="Remove catalog"/>
 		<node name="addCustomCatalog" value="Add catalog"/>
+		<node name="addCustomCatalogSummary" value="Add custom OPDS catalog manually"/>
 		<node name="confirmQuestions">
 			<node name="read" value="Do you want to read local copy?"/>
 			<node name="download" value="Do you want to download this book?"/>

data/resources/application/fr.xml

@@ -46,6 +46,7 @@
 		<node name="editCustomCatalog" toBeTranslated="true" value="Edit catalog"/>
 		<node name="removeCustomCatalog" toBeTranslated="true" value="Remove catalog"/>
 		<node name="addCustomCatalog" toBeTranslated="true" value="Add catalog"/>
+		<node name="addCustomCatalogSummary" toBeTranslated="true" value="Add custom OPDS catalog manually"/>
 		<node name="confirmQuestions">
 			<node name="read" value="Voulez-vous lire la copie locale?"/>
 			<node name="download" value="Voulez-vous télécharger ce livre?"/>

data/resources/application/hu.xml

@@ -46,6 +46,7 @@
 		<node name="editCustomCatalog" toBeTranslated="true" value="Edit catalog"/>
 		<node name="removeCustomCatalog" toBeTranslated="true" value="Remove catalog"/>
 		<node name="addCustomCatalog" toBeTranslated="true" value="Add catalog"/>
+		<node name="addCustomCatalogSummary" toBeTranslated="true" value="Add custom OPDS catalog manually"/>
 		<node name="confirmQuestions">
 			<node name="read" value="Elolvassa a helyi példányt?"/>
 			<node name="download" value="Letölti a könyvet?"/>

data/resources/application/it.xml

@@ -46,6 +46,7 @@
 		<node name="editCustomCatalog" value="Modifica catalogo"/>
 		<node name="removeCustomCatalog" value="Cancella catalogo"/>
 		<node name="addCustomCatalog" value="Aggiungi catalogo"/>
+		<node name="addCustomCatalogSummary" toBeTranslated="true" value="Add custom OPDS catalog manually"/>
 		<node name="confirmQuestions">
 			<node name="read" value="Vuoi leggere la copia locale?"/>
 			<node name="download" value="Vuoi scaricare questo libro?"/>

data/resources/application/ru.xml

@@ -45,6 +45,7 @@
 		<node name="editCustomCatalog" value="Изменить каталог"/>
 		<node name="removeCustomCatalog" value="Удалить каталог"/>
 		<node name="addCustomCatalog" value="Добавить каталог"/>
+		<node name="addCustomCatalogSummary" value="Добавить пользовательский OPDS каталог вручную"/>
 		<node name="confirmQuestions">
 			<node name="read" value="Вы хотите открыть локальную копию?"/>
 			<node name="download" value="Вы хотите скачать эту книгу?"/>

data/resources/application/vi.xml

@@ -46,6 +46,7 @@
 		<node name="editCustomCatalog" toBeTranslated="true" value="Edit catalog"/>
 		<node name="removeCustomCatalog" toBeTranslated="true" value="Remove catalog"/>
 		<node name="addCustomCatalog" toBeTranslated="true" value="Add catalog"/>
+		<node name="addCustomCatalogSummary" toBeTranslated="true" value="Add custom OPDS catalog manually"/>
 		<node name="confirmQuestions">
 			<node name="read" value="Bạn muốn đọc bản nội bộ?"/>
 			<node name="download" value="Bạn muốn tải về quyển sách này?"/>

data/resources/application/zh.xml

@@ -46,6 +46,7 @@
 		<node name="editCustomCatalog" toBeTranslated="true" value="Edit catalog"/>
 		<node name="removeCustomCatalog" toBeTranslated="true" value="Remove catalog"/>
 		<node name="addCustomCatalog" toBeTranslated="true" value="Add catalog"/>
+		<node name="addCustomCatalogSummary" toBeTranslated="true" value="Add custom OPDS catalog manually"/>
 		<node name="confirmQuestions">
 			<node name="read" value="是否本地阅读" />
 			<node name="download" value="是否下载本图书?" />

res/layout/network_custom_catalog_dialog.xml

@@ -51,20 +51,52 @@
 				android:layout_height="wrap_content"
 				android:orientation="vertical"
 			>
+				<RelativeLayout
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+				>
+					<TextView
+						android:id="@+id/network_catalog_title_star"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="*"
+						android:textColor="#ffff0000"
+						android:layout_marginLeft="4dp"
+						android:layout_alignParentRight="true"
+					/>
 					<EditText
 						android:id="@+id/network_catalog_title"
 						android:layout_width="fill_parent"
 						android:layout_height="wrap_content"
 						android:singleLine="true"
+						android:layout_alignParentLeft="true"
+						android:layout_toLeftOf="@id/network_catalog_title_star"
+					/>
+				</RelativeLayout>
+				<RelativeLayout
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:paddingTop="5dp"
+				>
+					<TextView
+						android:id="@+id/network_catalog_url_star"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="*"
+						android:textColor="#ffff0000"
+						android:layout_marginLeft="4dp"
+						android:layout_alignParentRight="true"
 					/>
 					<EditText
 						android:id="@+id/network_catalog_url"
 						android:layout_width="fill_parent"
 						android:layout_height="wrap_content"
 						android:singleLine="true"
-					android:layout_marginTop="5dp"
 						android:inputType="textUri"
+						android:layout_alignParentLeft="true"
+						android:layout_toLeftOf="@id/network_catalog_url_star"
 					/>
+				</RelativeLayout>
 				<EditText
 					android:id="@+id/network_catalog_summary"
 					android:layout_width="fill_parent"

src/org/geometerplus/android/fbreader/network/AddCustomCatalogItemTree.java

@@ -19,6 +19,9 @@
 
 package org.geometerplus.android.fbreader.network;
 
+import org.geometerplus.zlibrary.core.filesystem.ZLResourceFile;
+import org.geometerplus.zlibrary.core.image.ZLFileImage;
+import org.geometerplus.zlibrary.core.image.ZLImage;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 import org.geometerplus.fbreader.network.NetworkLibraryItem;
@@ -38,11 +41,17 @@ public class AddCustomCatalogItemTree extends NetworkTree {
 
 	@Override
 	public String getSummary() {
-		return null;
+		return ZLResource.resource("networkView").getResource("addCustomCatalogSummary").getValue();
 	}
 
 	@Override
 	public NetworkLibraryItem getHoldedItem() {
 		return null;
 	}
+
+	@Override
+	protected ZLImage createCover() {
+		ZLResourceFile file = ZLResourceFile.createResourceFile("R.drawable.ic_list_plus");
+		return new ZLFileImage("image/png", file);
+	}
 }

src/org/geometerplus/android/fbreader/network/SearchItemTree.java

@@ -53,7 +53,7 @@ public class SearchItemTree extends NetworkTree {
 
 	@Override
 	protected ZLImage createCover() {
-		ZLResourceFile file = ZLResourceFile.createResourceFile("data/searchresult.png");
+		ZLResourceFile file = ZLResourceFile.createResourceFile("R.drawable.ic_list_searchresult");
 		return new ZLFileImage("image/png", file);
 	}
 

src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java

@@ -125,10 +125,15 @@ public final class ZLAndroidLibrary extends ZLibrary {
 
 		AndroidResourceFile(String path) {
 			super(path);
-			final String fieldName =
+			final String drawablePrefix = "R.drawable.";
-				path.replace("/", "__").replace(".", "_").replace("-", "_").toLowerCase();
 			try {
+				if (path.startsWith(drawablePrefix)) {
+					final String fieldName = path.substring(drawablePrefix.length());
+					myResourceId = R.drawable.class.getField(fieldName).getInt(null);
+				} else {
+					final String fieldName = path.replace("/", "__").replace(".", "_").replace("-", "_").toLowerCase();
 					myResourceId = R.raw.class.getField(fieldName).getInt(null);
+				}
 				myExists = true;
 			} catch (NoSuchFieldException e) {
 			} catch (IllegalAccessException e) {