From 708e80f63c19abc1f65de738e36ba95e160f888c Mon Sep 17 00:00:00 2001
From: Debeet <krystian4842@gmail.com>
Date: Fri, 12 Jul 2013 02:40:43 +0200
Subject: [PATCH] Interface improvements

---
 .../res/layout/download_build_list_item.xml   |  2 +-
 OsmAnd/res/layout/download_index.xml          |  3 +-
 .../res/layout/download_index_list_item.xml   | 10 +++---
 .../layout/expandable_list_item_category.xml  | 12 ++++---
 OsmAnd/res/layout/list_menu_item.xml          |  3 +-
 OsmAnd/res/layout/local_index.xml             |  2 +-
 OsmAnd/res/layout/local_index_list_item.xml   | 31 ++++++++--------
 OsmAnd/res/layout/plugins.xml                 |  2 +-
 OsmAnd/res/layout/plugins_list_item.xml       | 14 ++++++--
 OsmAnd/res/layout/searchbyname_list.xml       |  4 ++-
 OsmAnd/res/layout/searchpoi_list.xml          | 35 +++++++++++++------
 OsmAnd/res/layout/searchpoifolder_list.xml    |  4 ++-
 OsmAnd/res/values/styles.xml                  |  4 +--
 13 files changed, 78 insertions(+), 48 deletions(-)

diff --git a/OsmAnd/res/layout/download_build_list_item.xml b/OsmAnd/res/layout/download_build_list_item.xml
index c1d26577e9..51d8431deb 100644
--- a/OsmAnd/res/layout/download_build_list_item.xml
+++ b/OsmAnd/res/layout/download_build_list_item.xml
@@ -8,4 +8,4 @@
 	<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="105dp"
 		android:layout_height="wrap_content" android:textSize="19sp" ></TextView>
 
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/download_index.xml b/OsmAnd/res/layout/download_index.xml
index bb4d8cc175..9c35e62700 100644
--- a/OsmAnd/res/layout/download_index.xml
+++ b/OsmAnd/res/layout/download_index.xml
@@ -83,8 +83,9 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="3dp"
         android:layout_marginRight="3dp"
+        android:layout_marginBottom="6dp"
         android:hint="@string/download_type_to_filter"
-        android:inputType="text"
+        android:inputType="textFilter"
         android:maxLines="1" />
 
     <ExpandableListView
diff --git a/OsmAnd/res/layout/download_index_list_item.xml b/OsmAnd/res/layout/download_index_list_item.xml
index 7bf690cae6..b0743c8839 100644
--- a/OsmAnd/res/layout/download_index_list_item.xml
+++ b/OsmAnd/res/layout/download_index_list_item.xml
@@ -1,15 +1,15 @@
 <?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:layout_height="wrap_content" android:paddingTop="1dp" android:paddingBottom="1dp" android:paddingRight="8dp">
 
 	<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:gravity="center_vertical" android:focusable="false" />
 	</LinearLayout>
-	<TextView android:id="@+id/download_item" android:gravity="top" android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:maxLines="7" android:layout_weight="1" android:textSize="16sp"></TextView>
+	<TextView android:id="@+id/download_item" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+		android:maxLines="7" android:layout_weight="1" style="@style/ListText.Small"></TextView>
 
-	<TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="top" android:layout_width="105dp"
-		android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
+	<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>
 
 </LinearLayout>
diff --git a/OsmAnd/res/layout/expandable_list_item_category.xml b/OsmAnd/res/layout/expandable_list_item_category.xml
index 97b3e96114..f1c5aa1926 100644
--- a/OsmAnd/res/layout/expandable_list_item_category.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category.xml
@@ -2,25 +2,29 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/expandable_category_color">
+    android:background="?attr/expandable_category_color"
+    android:paddingBottom="5dp"
+    android:paddingLeft="4dp"
+    android:paddingRight="4dp"
+    android:paddingTop="5dp" >
 
     <ImageView
         android:id="@+id/explist_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:paddingLeft="10dp"
+        android:paddingLeft="6dp"
         android:src="@drawable/expandable_category_unpushed" />
 
     <TextView
         android:id="@+id/category_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginLeft="8dp"
         android:layout_marginTop="0dp"
         android:autoLink="web"
         android:gravity="center_vertical"
-        android:textSize="22sp">
+        android:textSize="18sp">
     </TextView>
     
         <LinearLayout
diff --git a/OsmAnd/res/layout/list_menu_item.xml b/OsmAnd/res/layout/list_menu_item.xml
index 27bdab4c5a..a562a39a46 100644
--- a/OsmAnd/res/layout/list_menu_item.xml
+++ b/OsmAnd/res/layout/list_menu_item.xml
@@ -6,8 +6,7 @@
     android:orientation="horizontal"
     android:layout_marginLeft="5dip"
     android:layout_marginRight="5dip"
-    android:background="@color/color_white">
-

+    android:background="@color/color_white">

     <TextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml
index a58f0d5b06..c9071e9826 100644
--- a/OsmAnd/res/layout/local_index.xml
+++ b/OsmAnd/res/layout/local_index.xml
@@ -5,7 +5,7 @@
   android:layout_height="fill_parent" android:orientation="vertical">
  
 <TextView android:id="@+id/DescriptionText"  android:layout_width="fill_parent" android:layout_height="wrap_content" 
-       android:layout_marginLeft="10dp" android:layout_marginTop="3dp"
+       android:layout_marginLeft="10dp" android:layout_marginTop="3dp" android:layout_marginBottom="6dp"
        android:layout_marginRight="10dp" android:text="@string/download_link_and_local_description"/> 
  
 <ExpandableListView
diff --git a/OsmAnd/res/layout/local_index_list_item.xml b/OsmAnd/res/layout/local_index_list_item.xml
index 228b5fcbad..30731a8fe5 100644
--- a/OsmAnd/res/layout/local_index_list_item.xml
+++ b/OsmAnd/res/layout/local_index_list_item.xml
@@ -1,20 +1,19 @@
 <?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">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:orientation="vertical"
+	android:layout_height="wrap_content" android:paddingTop="4dp" android:paddingBottom="4dp" android:paddingRight="8dp" android:paddingLeft="8dp">
 
-  <LinearLayout android:layout_width="fill_parent"	android:layout_height="wrap_content" android:layout_marginLeft="15dp">
-	<LinearLayout android:layout_width="wrap_content" 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 android:layout_width="fill_parent" android:layout_height="wrap_content">
+		<LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent">
+			<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>
+		<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+			android:layout_weight="1" style="@style/ListText.Small"></TextView>
+		<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"></TextView>
 	</LinearLayout>
-	<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
-		android:layout_weight="1" style="@style/ListText.Small" android:layout_marginLeft="8dp"></TextView>
 
-	<TextView android:id="@+id/local_index_size" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="75dp"
-		android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
-  </LinearLayout>
-  
-  	<TextView android:id="@+id/local_index_descr" android:layout_marginLeft="25dp" android:layout_marginTop="5dp"
-  			android:layout_marginRight="10dp" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
-</LinearLayout>
+	<TextView android:id="@+id/local_index_descr" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
+			android:maxLines="7" style="@style/ListText.Small"></TextView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/plugins.xml b/OsmAnd/res/layout/plugins.xml
index 7c6c5c3e83..8ad8bd0085 100644
--- a/OsmAnd/res/layout/plugins.xml
+++ b/OsmAnd/res/layout/plugins.xml
@@ -7,5 +7,5 @@
 <TextView android:id="@+id/Label" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:text="@string/select_plugin_to_activate"></TextView>
 
 <ListView android:id="@android:id/list" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="wrap_content" 
-		android:layout_marginTop="3dp"></ListView>
+		android:layout_marginTop="10dp"></ListView>
 </LinearLayout>
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index 5f0cdf134c..57b31e2d77 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -5,6 +5,9 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:background="?attr/expandable_category_color"
+        android:paddingTop="6dp"
+        android:paddingBottom="3dp"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content">
         <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="5dp"
@@ -17,10 +20,11 @@
         android:id="@+id/plugin_name"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:gravity="top"
         android:textStyle="bold"
         android:textColor="?android:textColorPrimary"
-        style="@style/ListText.Small" android:text="@string/extra_settings"
-         android:paddingLeft="5dp" android:paddingRight="10dp">
+        style="@style/ListText" android:text="@string/extra_settings"
+        android:paddingRight="10dp">
     </TextView>
 	</LinearLayout>
     <TextView
@@ -31,7 +35,11 @@
         android:maxLines="7"
         android:text="@string/osmand_extra_settings_description"
         android:textColor="?android:textColorSecondary"
-        android:textSize="14sp" android:paddingLeft="10dp" android:paddingRight="10dp">
+        android:textSize="14sp"
+        android:paddingRight="10dp"
+        android:paddingLeft="10dp"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp">
 
     </TextView>
 
diff --git a/OsmAnd/res/layout/searchbyname_list.xml b/OsmAnd/res/layout/searchbyname_list.xml
index 2cae6296bf..a19f85cf6a 100644
--- a/OsmAnd/res/layout/searchbyname_list.xml
+++ b/OsmAnd/res/layout/searchbyname_list.xml
@@ -1,7 +1,9 @@
 <?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="6dp"
+	android:paddingBottom="6dp"
 	android:orientation="horizontal">
 	<TextView android:id="@+id/NameLabel" android:layout_width="fill_parent"
-		android:layout_height="fill_parent" style="@style/ListText.Small"/>
+		android:layout_height="fill_parent" style="@style/ListText"/>
 </LinearLayout>
diff --git a/OsmAnd/res/layout/searchpoi_list.xml b/OsmAnd/res/layout/searchpoi_list.xml
index 8ca65f0569..4f405a0890 100644
--- a/OsmAnd/res/layout/searchpoi_list.xml
+++ b/OsmAnd/res/layout/searchpoi_list.xml
@@ -1,16 +1,31 @@
 <?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="horizontal">
-
-	<ImageView android:id="@+id/poi_direction" android:layout_width="26dp" android:layout_height="26dp"
-		android:layout_marginLeft="2dp" android:layout_marginTop="2dp"
-		android:paddingTop="0dp" />
-	<ImageView android:id="@+id/poi_icon" android:layout_width="26dp" android:layout_height="26dp"
-		android:layout_marginLeft="2dp" android:layout_marginTop="2dp"
-		android:paddingTop="0dp" />
+	android:paddingTop="6dp"
+	android:paddingBottom="6dp"
+	>
 	
-	<TextView android:id="@+id/poi_label" android:layout_width="wrap_content"
-		android:layout_height="wrap_content" style="@style/ListText.Small"/>
+    <LinearLayout android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal"
+        android:paddingLeft="6dp"
+        android:paddingRight="3dp">
+
+        <ImageView android:id="@+id/poi_direction" android:layout_width="26dp" android:layout_height="26dp"
+			/>
+        
+        <ImageView android:id="@+id/poi_icon" android:layout_width="26dp" android:layout_height="26dp"
+			android:layout_marginLeft="3dp" />
+        
+    </LinearLayout>
+
+	<LinearLayout android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingRight="3dp">
+	
+		<TextView android:id="@+id/poi_label" android:layout_width="fill_parent"
+			android:layout_height="fill_parent" android:gravity="center_vertical" style="@style/ListText.Small"/>
+	
+	</LinearLayout>
 	
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/searchpoifolder_list.xml b/OsmAnd/res/layout/searchpoifolder_list.xml
index a892ab79c7..2684dff6d8 100644
--- a/OsmAnd/res/layout/searchpoifolder_list.xml
+++ b/OsmAnd/res/layout/searchpoifolder_list.xml
@@ -1,13 +1,15 @@
 <?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="6dp"
+	android:paddingBottom="6dp"
 	android:orientation="horizontal">
 
 	<ImageView android:id="@+id/folder_icon" android:layout_width="37dip"
 		android:paddingLeft="8dp" android:paddingRight="8dp"
 		android:paddingTop="2dp" android:layout_height="fill_parent" />
 	<TextView android:id="@+id/folder_label" android:layout_width="wrap_content" android:layout_weight="1"
-		android:layout_height="wrap_content" style="@style/ListText.Small"/>
+		android:layout_height="wrap_content" style="@style/ListText"/>
 	
 	<ImageView android:id="@+id/folder_edit_icon"
 		android:paddingLeft="4dp" android:paddingRight="8dp" android:src="@android:drawable/ic_input_get"
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index ee31bdedc2..323a75a620 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -10,10 +10,10 @@
 		
 	
 	<style name="ListText">
-        <item name="android:textSize">25sp</item>
+        <item name="android:textSize">18sp</item>
     </style>
     <style name="ListText.Small">
-        <item name="android:textSize">21sp</item>
+        <item name="android:textSize">16sp</item>
     </style>
     
     <style name="OsmandListView" parent="@android:style/Widget.ListView">