Merge pull request #5224 from osmandapp/WikivoyageImprovements

change sizes and padding of explistview items

OsmAnd/res/layout/fragment_wikivoyage_article_dialog.xml

@@ -74,12 +74,6 @@
 			android:layout_height="10dp"
 			android:background="@drawable/bg_contextmenu_shadow_top_light" />
 
-		<View
-			android:id="@+id/bottom_row_divider"
-			android:layout_width="match_parent"
-			android:layout_height="1dp"
-			android:background="?attr/wikivoyage_bottom_bar_divider_color"/>
-
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/bottom_sheet_cancel_button_height"
@@ -98,7 +92,7 @@
 				android:letterSpacing="@dimen/text_button_letter_spacing"
 				android:maxLines="1"
 				android:paddingBottom="@dimen/context_menu_padding_margin_tiny"
-				android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
+				android:paddingLeft="@dimen/bottom_sheet_content_margin"
 				android:paddingRight="@dimen/bottom_sheet_content_padding_small"
 				android:paddingTop="@dimen/context_menu_padding_margin_tiny"
 				android:text="@string/shared_string_contents"
@@ -107,7 +101,7 @@
 				osmand:typeface="@string/font_roboto_medium"
 				tools:drawableLeft="@drawable/ic_action_list_header"
 				tools:drawableTint="?attr/wikivoyage_active_color"
-				tools:ignore="UnusedAttribute"/>
+				tools:ignore="UnusedAttribute" />
 
 			<net.osmand.plus.widgets.TextViewEx
 				android:id="@+id/save_button"
@@ -123,7 +117,7 @@
 				android:maxLines="1"
 				android:paddingBottom="@dimen/context_menu_padding_margin_tiny"
 				android:paddingLeft="@dimen/bottom_sheet_content_padding_small"
-				android:paddingRight="@dimen/bottom_sheet_content_padding_small"
+				android:paddingRight="@dimen/bottom_sheet_content_margin"
 				android:paddingTop="@dimen/context_menu_padding_margin_tiny"
 				android:textColor="?attr/wikivoyage_active_color"
 				android:textSize="@dimen/default_desc_text_size"
@@ -131,7 +125,7 @@
 				tools:drawableRight="@drawable/ic_action_read_later_fill"
 				tools:drawableTint="?attr/wikivoyage_active_color"
 				tools:ignore="UnusedAttribute"
-				tools:text="Save"/>
+				tools:text="Save" />
 
 		</LinearLayout>
 

OsmAnd/res/layout/wikivoyage_contents_list_item.xml

@@ -1,23 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-    android:layout_height="@dimen/bottom_sheet_list_item_height"
+	android:layout_height="wrap_content"
-    android:background="?attr/expandable_list_item_background"
+	android:background="?attr/selectableItemBackground"
 	android:orientation="vertical">
 
-    <TextView
+	<View
-        android:id="@+id/item_label"
+		android:id="@+id/upper_row_divider"
 		android:layout_width="wrap_content"
+		android:layout_height="1dp"
+		android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
+		android:background="?attr/wikivoyage_card_divider_color" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/item_label"
+			android:layout_width="0dp"
 			android:layout_height="@dimen/bottom_sheet_list_item_height"
 			android:layout_gravity="center_vertical"
-        android:drawablePadding="@dimen/showAllButtonMarginRight"
+			android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
-        android:gravity="center"
+			android:layout_marginStart="@dimen/bottom_sheet_content_margin"
-        android:paddingLeft="@dimen/showAllButtonMarginRight"
+			android:layout_weight="1"
-        android:textColor="?android:textColorPrimary"
+			android:drawablePadding="@dimen/bottom_sheet_content_margin"
+			android:gravity="start|center_vertical"
 			android:textSize="@dimen/default_list_text_size"
-        tools:drawableStart="@drawable/ic_action_list_sort"
+			osmand:typeface="@string/font_roboto_medium"
-        tools:text="@string/shared_string_contents"
+			tools:drawableStart="@drawable/ic_action_list_header"
-        tools:textStyle="bold" />
+			tools:text="@string/shared_string_contents" />
+
+		<ImageView
+			android:id="@+id/explist_indicator"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_gravity="end"
+			android:paddingLeft="@dimen/list_content_padding"
+			android:paddingRight="@dimen/list_content_padding"
+			android:scaleType="center"
+			tools:src="@drawable/ic_action_arrow_up" />
+
+	</LinearLayout>
+
+	<View
+		android:id="@+id/bottom_row_divider"
+		android:layout_width="wrap_content"
+		android:layout_height="1dp"
+		android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
+		android:background="?attr/wikivoyage_card_divider_color" />
 
 </LinearLayout>

OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleContentsFragment.java

@@ -10,11 +10,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ExpandableListView;
-import android.widget.ExpandableListView.OnGroupClickListener;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.OsmandBaseExpandableListAdapter;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
@@ -36,6 +35,8 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 
 	public static final int REQUEST_LINK_CODE = 0;
 
+	private ExpandableListView expListView;
+
 	private LinkedHashMap<String, String> map;
 	private String link;
 
@@ -63,11 +64,14 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 
 		items.add(new TitleItem(getString(R.string.shared_string_contents)));
 
-		ExpandableListView expListView = new ExpandableListView(getContext());
+		expListView = new ExpandableListView(getContext());
 		ExpandableListAdapter listAdapter = new ExpandableListAdapter(getContext(), listDataHeader, listDataChild);
 
 		expListView.setAdapter(listAdapter);
-		expListView.setChildDivider(ContextCompat.getDrawable(getContext(), R.color.color_transparent));
+		Drawable transparent = ContextCompat.getDrawable(getContext(), R.color.color_transparent);
+		expListView.setDivider(transparent);
+		expListView.setGroupIndicator(transparent);
+		expListView.setSelector(transparent);
 		expListView.setLayoutParams(new LinearLayout.LayoutParams(
 				LinearLayout.LayoutParams.MATCH_PARENT,
 				LinearLayout.LayoutParams.MATCH_PARENT)
@@ -83,23 +87,12 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 				return false;
 			}
 		});
-
+		expListView.setOnGroupClickListener(new ExpandableListView.OnGroupClickListener() {
-		int width = AndroidUtils.getScreenWidth(getActivity());
-		if (android.os.Build.VERSION.SDK_INT < 18) {
-			expListView.setIndicatorBounds(width - (AndroidUtils.dpToPx(getContext(), 50)),
-					width - (AndroidUtils.dpToPx(getContext(), 10)));
-		} else {
-			expListView.setIndicatorBoundsRelative(width - (AndroidUtils.dpToPx(getContext(), 50)),
-					width - (AndroidUtils.dpToPx(getContext(), 10)));
-		}
-		expListView.setOnGroupClickListener(new OnGroupClickListener() {
 			@Override
 			public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) {
 				link = map.get(listDataHeader.get(groupPosition));
 				sendResult();
-				if (listDataChild.get(listDataHeader.get(groupPosition)) == null) {
 				dismiss();
-				}
 				return false;
 			}
 		});
@@ -158,7 +151,7 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 
 		@Override
 		public Object getChild(int groupPosition, int childPosititon) {
-			return this.listDataChild.get(this.listDataHeader.get(groupPosition)).get(childPosititon);
+			return listDataChild.get(listDataHeader.get(groupPosition)).get(childPosititon);
 		}
 
 		@Override
@@ -181,6 +174,14 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 					: R.color.wikivoyage_contents_parent_icon_light));
 			txtListChild.setCompoundDrawablesWithIntrinsicBounds(itemChildIcon, null, null, null);
 
+			convertView.findViewById(R.id.upper_row_divider).setVisibility(View.GONE);
+			txtListChild.setTypeface(null);
+			if (childPosition == listDataChild.get(listDataHeader.get(groupPosition)).size() - 1) {
+				convertView.findViewById(R.id.bottom_row_divider).setVisibility(View.VISIBLE);
+			} else {
+				convertView.findViewById(R.id.bottom_row_divider).setVisibility(View.GONE);
+			}
+
 			return convertView;
 		}
 
@@ -206,18 +207,36 @@ public class WikivoyageArticleContentsFragment extends MenuBottomSheetDialogFrag
 		}
 
 		@Override
-		public View getGroupView(int groupPosition, boolean isExpanded,
+		public View getGroupView(final int groupPosition, final boolean isExpanded,
 		                         View convertView, ViewGroup parent) {
 			String headerTitle = (String) getGroup(groupPosition);
 			if (convertView == null) {
 				convertView = LayoutInflater.from(context)
 						.inflate(R.layout.wikivoyage_contents_list_item, parent, false);
 			}
+			boolean light = getMyApplication().getSettings().isLightContent();
 			TextView lblListHeader = (TextView) convertView.findViewById(R.id.item_label);
 			lblListHeader.setText(headerTitle);
 			lblListHeader.setTextColor(getResolvedColor(isNightMode() ? R.color.wikivoyage_contents_parent_icon_dark : R.color.wikivoyage_contents_parent_icon_light));
 			lblListHeader.setCompoundDrawablesWithIntrinsicBounds(itemGroupIcon, null, null, null);
 
+			adjustIndicator(getMyApplication(), groupPosition, isExpanded, convertView, light);
+			ImageView indicator = (ImageView) convertView.findViewById(R.id.explist_indicator);
+			indicator.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					if(isExpanded){
+						expListView.collapseGroup(groupPosition);
+					} else {
+						expListView.expandGroup(groupPosition);
+					}
+				}
+			});
+			if (isExpanded) {
+				convertView.findViewById(R.id.bottom_row_divider).setVisibility(View.GONE);
+			} else {
+				convertView.findViewById(R.id.bottom_row_divider).setVisibility(View.VISIBLE);
+			}
 			return convertView;
 		}