From 8df9966f42b7fada6b257ecd3e05d8b14e929563 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Mon, 2 Apr 2018 14:37:31 +0300
Subject: [PATCH] Add footer to wikivoyage search list

---
 .../fragment_wikivoyage_search_dialog.xml     |  2 +
 .../layout/wikivoyage_search_list_item.xml    | 91 +++++++++++--------
 .../search/SearchRecyclerViewAdapter.java     |  3 +
 3 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_wikivoyage_search_dialog.xml b/OsmAnd/res/layout/fragment_wikivoyage_search_dialog.xml
index 03ef56bd66..deb610a3cf 100644
--- a/OsmAnd/res/layout/fragment_wikivoyage_search_dialog.xml
+++ b/OsmAnd/res/layout/fragment_wikivoyage_search_dialog.xml
@@ -30,6 +30,8 @@
 		android:id="@+id/recycler_view"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
+		android:clipToPadding="false"
+		android:paddingBottom="@dimen/map_markers_recycler_view_padding_bottom"
 		android:scrollbars="vertical"/>
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/wikivoyage_search_list_item.xml b/OsmAnd/res/layout/wikivoyage_search_list_item.xml
index 420febfba8..24404975d3 100644
--- a/OsmAnd/res/layout/wikivoyage_search_list_item.xml
+++ b/OsmAnd/res/layout/wikivoyage_search_list_item.xml
@@ -4,61 +4,74 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:background="?attr/wikivoyage_card_bg_color"
 	android:orientation="vertical">
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:background="?attr/selectableItemBackground"
-		android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding">
-
-		<ImageView
-			android:id="@+id/icon"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="@dimen/content_padding"
-			android:layout_marginRight="@dimen/content_padding"
-			tools:src="@drawable/ic_action_placeholder_city"/>
+		android:background="?attr/wikivoyage_card_bg_color"
+		android:orientation="vertical">
 
 		<LinearLayout
-			android:layout_width="0dp"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_weight="1"
-			android:orientation="vertical">
+			android:background="?attr/selectableItemBackground"
+			android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding">
 
-			<TextView
-				android:id="@+id/title"
+			<ImageView
+				android:id="@+id/icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="1"
-				android:textAppearance="@style/TextAppearance.ListItemTitle"
-				tools:text="Amsterdam"/>
+				android:layout_gravity="center_vertical"
+				android:layout_marginEnd="@dimen/content_padding"
+				android:layout_marginRight="@dimen/content_padding"
+				tools:src="@drawable/ic_action_placeholder_city"/>
 
-			<TextView
-				android:id="@+id/description"
-				android:layout_width="wrap_content"
+			<LinearLayout
+				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:maxLines="2"
-				android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
-				tools:text="Amstellend North Holland"/>
+				android:layout_gravity="center_vertical"
+				android:layout_weight="1"
+				android:orientation="vertical">
+
+				<TextView
+					android:id="@+id/title"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:ellipsize="end"
+					android:maxLines="1"
+					android:textAppearance="@style/TextAppearance.ListItemTitle"
+					tools:text="Amsterdam"/>
+
+				<TextView
+					android:id="@+id/description"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:ellipsize="end"
+					android:maxLines="2"
+					android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
+					tools:text="Amstellend North Holland"/>
+			</LinearLayout>
+
 		</LinearLayout>
 
+		<View
+			android:id="@+id/divider"
+			android:layout_width="match_parent"
+			android:layout_height="1dp"
+			android:layout_marginLeft="@dimen/bottom_sheet_selected_item_title_height"
+			android:layout_marginStart="@dimen/bottom_sheet_selected_item_title_height"
+			android:background="?attr/wikivoyage_card_divider_color"
+			android:focusable="false"/>
+
 	</LinearLayout>
 
-	<View
-		android:id="@+id/divider"
-		android:layout_width="match_parent"
-		android:layout_height="1dp"
-		android:layout_marginLeft="@dimen/bottom_sheet_selected_item_title_height"
-		android:layout_marginStart="@dimen/bottom_sheet_selected_item_title_height"
-		android:background="?attr/wikivoyage_card_divider_color"
-		android:focusable="false"/>
+	<include
+		android:id="@+id/shadow"
+		layout="@layout/card_bottom_divider"
+		android:visibility="gone"
+		tools:visibility="visible"/>
 
 </LinearLayout>
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java b/OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java
index 7eda185ae9..90f598529f 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/search/SearchRecyclerViewAdapter.java
@@ -51,6 +51,7 @@ public class SearchRecyclerViewAdapter extends RecyclerView.Adapter<SearchRecycl
 		holder.title.setText(item.getArticleTitle().toString());
 		holder.description.setText(item.getLang().toString());
 		holder.divider.setVisibility(lastItem ? View.GONE : View.VISIBLE);
+		holder.shadow.setVisibility(lastItem ? View.VISIBLE : View.GONE);
 	}
 
 	@Override
@@ -77,6 +78,7 @@ public class SearchRecyclerViewAdapter extends RecyclerView.Adapter<SearchRecycl
 		final TextView title;
 		final TextView description;
 		final View divider;
+		final View shadow;
 
 		public ViewHolder(View itemView) {
 			super(itemView);
@@ -84,6 +86,7 @@ public class SearchRecyclerViewAdapter extends RecyclerView.Adapter<SearchRecycl
 			title = (TextView) itemView.findViewById(R.id.title);
 			description = (TextView) itemView.findViewById(R.id.description);
 			divider = itemView.findViewById(R.id.divider);
+			shadow = itemView.findViewById(R.id.shadow);
 		}
 	}
 }