SearchItemTree has been moved to a platform-independent code (search doesn't work at the momemnt)

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

@@ -39,11 +39,9 @@ import org.geometerplus.zlibrary.ui.android.image.ZLAndroidImageData;
 import org.geometerplus.fbreader.network.NetworkTree;
 import org.geometerplus.fbreader.network.tree.NetworkBookTree;
 import org.geometerplus.fbreader.network.tree.AddCustomCatalogItemTree;
-
+import org.geometerplus.fbreader.network.tree.SearchItemTree;
-import org.geometerplus.android.fbreader.tree.ZLAndroidTree;
 
 abstract class NetworkBaseActivity extends ListActivity implements NetworkView.EventListener {
-
 	protected final ZLResource myResource = ZLResource.resource("networkView");
 
 	public BookDownloaderServiceConnection Connection;
@@ -110,8 +108,8 @@ abstract class NetworkBaseActivity extends ListActivity implements NetworkView.E
 			coverView.setImageResource(R.drawable.ic_list_plus);
 			return;
 		}
-		if (tree instanceof ZLAndroidTree) {
+		if (tree instanceof SearchItemTree) {
-			coverView.setImageResource(((ZLAndroidTree)tree).getCoverResourceId());
+			coverView.setImageResource(R.drawable.ic_list_searchresult);
 			return;
 		}
 

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

@@ -226,17 +226,11 @@ public class NetworkLibraryActivity extends NetworkBaseActivity {
 			if (!NetworkView.Instance().isInitialized()) {
 				return 0;
 			}
-			return myTree.subTrees().size() + 1; // subtrees + <search item>
+			return myTree.subTrees().size();
 		}
 
 		public final NetworkTree getItem(int position) {
-			final int size = myTree.subTrees().size();
+			return (NetworkTree)myTree.subTrees().get(position);
-			if (position == 0) {
-				return NetworkView.Instance().getSearchItemTree();
-			} else if (position > 0 && position <= size) {
-				return (NetworkTree)myTree.subTrees().get(position - 1);
-			}
-			return null;
 		}
 
 		public final long getItemId(int position) {

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

@@ -32,6 +32,7 @@ import org.geometerplus.zlibrary.core.resources.ZLResource;
 import org.geometerplus.zlibrary.core.network.ZLNetworkException;
 
 import org.geometerplus.fbreader.network.*;
+import org.geometerplus.fbreader.network.tree.SearchItemTree;
 
 
 public class NetworkSearchActivity extends Activity {
@@ -54,7 +55,6 @@ public class NetworkSearchActivity extends Activity {
 	}
 
 	private class SearchHandler extends ItemsLoadingHandler {
-
 		private final SearchItemTree myTree;
 
 		public SearchHandler(SearchItemTree tree) {
@@ -152,6 +152,7 @@ public class NetworkSearchActivity extends Activity {
 		final String summary = ZLResource.resource("networkView").getResource("searchResults").getValue().replace("%s", pattern);
 		final SearchResult result = new SearchResult(summary);
 
+		/*
 		final SearchItemTree tree = NetworkView.Instance().getSearchItemTree();
 
 		tree.setSearchResult(result);
@@ -164,5 +165,6 @@ public class NetworkSearchActivity extends Activity {
 			new SearchRunnable(handler, pattern)
 		);
 		NetworkView.Instance().openTree(this, tree);
+		*/
 	}
 }

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

@@ -69,9 +69,6 @@ class NetworkView {
 		myActions.add(new AddCustomCatalogItemActions());
 		myActions.trimToSize();
 
-		final NetworkTree root = library.getRootTree();
-		mySearchItem = new SearchItemTree(root);
-
 		myInitialized = true;
 	}
 
@@ -290,14 +287,4 @@ class NetworkView {
 	public NetworkCatalogActivity getOpenedActivity(NetworkTree.Key key) {
 		return myOpenedActivities.get(key);
 	}
-
-	/*
-	 * Special view items item
-	 */
-
-	private SearchItemTree mySearchItem;
-
-	public SearchItemTree getSearchItemTree() {
-		return mySearchItem;
-	}
 }

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

@@ -25,6 +25,7 @@ import android.view.ContextMenu;
 
 import org.geometerplus.fbreader.network.NetworkTree;
 import org.geometerplus.fbreader.network.SearchResult;
+import org.geometerplus.fbreader.network.tree.SearchItemTree;
 
 class SearchItemActions extends NetworkTreeActions {
 

src/org/geometerplus/fbreader/network/NetworkLibrary.java

@@ -364,6 +364,7 @@ public class NetworkLibrary {
 			tree.removeSelf();
 		}
 		new AddCustomCatalogItemTree(myRootTree);
+		new SearchItemTree(myRootTree, 0);
 	}
 
 	private void updateVisibility() {

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

@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
 
-package org.geometerplus.android.fbreader.network;
+package org.geometerplus.fbreader.network.tree;
 
 import java.util.Set;
 import java.util.LinkedList;
@@ -29,15 +29,11 @@ import org.geometerplus.fbreader.tree.FBTree;
 import org.geometerplus.fbreader.network.*;
 import org.geometerplus.fbreader.network.tree.NetworkAuthorTree;
 
-import org.geometerplus.zlibrary.ui.android.R;
+public class SearchItemTree extends NetworkTree {
-
-import org.geometerplus.android.fbreader.tree.ZLAndroidTree;
-
-public class SearchItemTree extends NetworkTree implements ZLAndroidTree {
 	private SearchResult myResult;
 
-	public SearchItemTree(NetworkTree parent) {
+	public SearchItemTree(NetworkTree parent, int position) {
-		super(parent);
+		super(parent, position);
 	}
 
 	@Override
@@ -50,10 +46,6 @@ public class SearchItemTree extends NetworkTree implements ZLAndroidTree {
 		return ZLResource.resource("networkView").getResource("searchSummary").getValue();
 	}
 
-	public int getCoverResourceId() {
-		return R.drawable.ic_list_searchresult;
-	}
-
 	public void setSearchResult(SearchResult result) {
 		myResult = result;
 		clear();