From 05492d11712282a95813c3a307803339be22d8a9 Mon Sep 17 00:00:00 2001
From: Denis <barsik107@gmail.com>
Date: Fri, 6 Feb 2015 14:18:18 +0200
Subject: [PATCH] Updated expandable listview views

---
 .../res/layout/download_index_list_item.xml   | 61 ++++++------
 OsmAnd/res/layout/favourites_list_item.xml    | 63 ++++++------
 OsmAnd/res/layout/gpx_item_list_item.xml      | 98 ++++++++++---------
 OsmAnd/res/layout/local_index_list_item.xml   | 97 ++++++++++--------
 OsmAnd/res/values/sizes.xml                   |  1 +
 5 files changed, 167 insertions(+), 153 deletions(-)

diff --git a/OsmAnd/res/layout/download_index_list_item.xml b/OsmAnd/res/layout/download_index_list_item.xml
index 3fbe8fc0f0..0a65440190 100644
--- a/OsmAnd/res/layout/download_index_list_item.xml
+++ b/OsmAnd/res/layout/download_index_list_item.xml
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="1dp"
-    android:paddingBottom="1dp"
-    android:paddingRight="@dimen/list_content_padding"
-    android:paddingLeft="@dimen/list_content_padding">
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:layout_width="fill_parent"
+			  android:layout_height="@dimen/list_item_height"
+			  android:paddingBottom="1dp"
+			  android:paddingLeft="@dimen/list_content_padding"
+			  android:paddingRight="@dimen/list_content_padding"
+			  android:paddingTop="1dp">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent">
+	<CheckBox
+		android:id="@+id/check_download_item"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:focusable="false"
+		android:layout_gravity="center_vertical"/>
 
-        <CheckBox
-            android:id="@+id/check_download_item"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:focusable="false" />
-    </LinearLayout>
+	<TextView
+		android:id="@+id/download_item"
+		style="@style/ListText.Small"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:layout_gravity="center_vertical"
+		tools:text="@string/lorem_ipsum"
+		android:maxLines="7"/>
 
-    <TextView
-        android:id="@+id/download_item"
-        android:gravity="center_vertical"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:maxLines="7"
-        android:layout_weight="1"
-        style="@style/ListText.Small" />
-
-    <TextView
-        android:id="@+id/download_descr"
-        android:layout_marginLeft="3dp"
-        android:gravity="right"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/ListText.Small" />
+	<TextView
+		android:id="@+id/download_descr"
+		style="@style/ListText.Small"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="3dp"
+		android:gravity="right"/>
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/favourites_list_item.xml b/OsmAnd/res/layout/favourites_list_item.xml
index 680507d7a8..2e18097cb3 100644
--- a/OsmAnd/res/layout/favourites_list_item.xml
+++ b/OsmAnd/res/layout/favourites_list_item.xml
@@ -1,43 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingBottom="5dp"
-    android:paddingLeft="@dimen/list_content_padding"
-    android:paddingRight="@dimen/list_content_padding"
-    android:paddingTop="5dp">
+			  android:layout_width="fill_parent"
+			  android:layout_height="@dimen/list_item_height"
+			  android:orientation="horizontal"
+			  android:paddingBottom="5dp"
+			  android:paddingLeft="@dimen/list_content_padding"
+			  android:paddingRight="@dimen/list_content_padding"
+			  android:paddingTop="5dp">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+	<CheckBox
+		android:id="@+id/check_item"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:focusable="false"
+		android:gravity="center_vertical"
+		android:visibility="gone"/>
 
-        <CheckBox
-            android:id="@+id/check_item"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:focusable="false"
-            android:visibility="gone" />
-    </LinearLayout>
 
-    <ImageView
-        android:id="@+id/favourite_icon"
-        android:layout_width="25dp"
-        android:paddingRight="2dp"
-        android:paddingTop="2dp"
-        android:layout_height="fill_parent" />
+	<ImageView
+		android:id="@+id/favourite_icon"
+		android:layout_width="25dp"
+		android:layout_height="fill_parent"
+		android:paddingRight="2dp"
+		android:paddingTop="2dp"/>
 
-    <TextView
-        android:id="@+id/favourite_label"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="10dp"
-		android:textColor="?android:textColorPrimary"
-        android:layout_height="wrap_content"
-		android:maxLines="1"
+	<TextView
+		android:id="@+id/favourite_label"
+		style="@style/ListText"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_marginLeft="10dp"
 		android:ellipsize="end"
-		tools:text="@string/lorem_ipsum"
-        style="@style/ListText" />
+		android:maxLines="1"
+		android:textColor="?android:textColorPrimary"
+		tools:text="@string/lorem_ipsum"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/gpx_item_list_item.xml b/OsmAnd/res/layout/gpx_item_list_item.xml
index 1b20a3f4ea..724d256b6c 100644
--- a/OsmAnd/res/layout/gpx_item_list_item.xml
+++ b/OsmAnd/res/layout/gpx_item_list_item.xml
@@ -1,56 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="4dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="4dp">
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:layout_width="fill_parent"
+			  android:layout_height="@dimen/list_item_height"
+			  android:orientation="vertical"
+			  android:paddingLeft="8dp"
+			  android:paddingRight="8dp">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
 
-        <FrameLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="3dp">
+		<FrameLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginLeft="3dp">
 
-            <ImageView
-                android:id="@+id/icon"
-                android:layout_width="25dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="2dp" />
+			<ImageView
+				android:id="@+id/icon"
+				android:layout_width="25dp"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_marginTop="2dp"/>
 
-            <TextView
-                android:id="@+id/additional"
-                style="@style/ListText.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginRight="3dp"
-                android:layout_marginLeft="2dp"></TextView>
-        </FrameLayout>
+			<TextView
+				android:id="@+id/additional"
+				style="@style/ListText.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				tools:text="@string/lorem_ipsum"
+				android:maxLines="2"
+				android:layout_marginLeft="2dp"
+				android:layout_marginRight="3dp"
+				android:textSize="@dimen/dashFavNameTextSize"/>
+		</FrameLayout>
 
-        <TextView
-            android:id="@+id/name"
-            style="@style/ListText.Small"
-            android:layout_width="0dp"
-            android:paddingTop="2dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"></TextView>
-    </LinearLayout>
+		<TextView
+			android:id="@+id/name"
+			style="@style/ListText.Small"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			tools:text="@string/lorem_ipsum"
+			android:layout_marginLeft="5dp"
+			android:textSize="@dimen/dashFavNameTextSize"
+			android:layout_weight="1"
+			android:paddingTop="2dp"/>
+	</LinearLayout>
 
-    <TextView
-        android:id="@+id/description"
-        style="@style/ListText.Small"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:maxLines="25"></TextView>
+	<TextView
+		android:id="@+id/description"
+		style="@style/ListText.Small"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:gravity="center_vertical"
+		android:textSize="@dimen/dashFavNameTextSize"
+		android:maxLines="25"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 8820cfba9f..4a567e89f9 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -1,52 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:orientation="vertical"
-    android:layout_height="wrap_content"
-    android:paddingLeft="@dimen/list_content_padding"
-    android:paddingRight="@dimen/list_content_padding"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp">
+			  xmlns:tools="http://schemas.android.com/tools"
+			  android:layout_width="fill_parent"
+			  android:layout_height="@dimen/list_item_height"
+			  android:orientation="horizontal"
+			  android:paddingBottom="4dp"
+			  android:paddingLeft="@dimen/list_content_padding"
+			  android:paddingRight="@dimen/list_content_padding"
+			  android:paddingTop="4dp">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent">
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content">
 
-            <CheckBox
-                android:id="@+id/check_local_index"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:focusable="false" />
-        </LinearLayout>
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent">
 
-        <TextView
-            android:id="@+id/local_index_name"
-            android:gravity="center_vertical"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            style="@style/ListText.Small"/>
+				<CheckBox
+					android:id="@+id/check_local_index"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:focusable="false"
+					android:gravity="center_vertical"/>
+			</LinearLayout>
 
-        <TextView
-            android:id="@+id/local_index_size"
-            android:layout_marginLeft="3dp"
-            android:gravity="right"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/ListText.Small"/>
-    </LinearLayout>
+			<TextView
+				android:id="@+id/local_index_name"
+				style="@style/ListText.Small"
+				android:layout_width="0dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:gravity="center_vertical"
+				android:maxLines="1"
+				tools:text="@string/lorem_ipsum"/>
+
+			<TextView
+				android:id="@+id/local_index_size"
+				style="@style/ListText.Small"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="3dp"
+				android:gravity="right"/>
+		</LinearLayout>
+
+		<TextView
+			android:id="@+id/local_index_descr"
+			style="@style/ListText.Small"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:gravity="center_vertical"
+			android:maxLines="25"
+			tools:text="@string/lorem_ipsum"/>
+
+	</LinearLayout>
 
-    <TextView
-        android:id="@+id/local_index_descr"
-        android:gravity="center_vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:maxLines="25"
-        style="@style/ListText.Small"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 1379f13e29..85288eaa29 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -25,6 +25,7 @@
     <dimen name="list_content_padding">16dp</dimen>
     <dimen name="list_header_padding">8dp</dimen>
     <dimen name="tab_height">48dp</dimen>
+	<dimen name="list_item_height">48dp</dimen>
 
     <!-- TextSizes -->
     <dimen name="showAllButtonTextSize">12sp</dimen>