Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #467 from Debeet/master

Browse source 
Many interface improvements
This commit is contained in:
vshcherb 2013-07-14 04:03:53 -07:00
commit f66658a99e
13 changed files with 78 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/layout/download_index.xml
View file

@ -83,8 +83,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginLeft="3dp"
android:layout_marginRight="3dp" android:layout_marginRight="3dp"
android:layout_marginBottom="6dp"
android:hint="@string/download_type_to_filter" android:hint="@string/download_type_to_filter"
android:inputType="text" android:inputType="textFilter"
android:maxLines="1" /> android:maxLines="1" />
<ExpandableListView <ExpandableListView

10
OsmAnd/res/layout/download_index_list_item.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" <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"> <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" <CheckBox android:id="@+id/check_download_item" android:layout_width="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:focusable="false" /> android:gravity="center_vertical" android:focusable="false" />
</LinearLayout> </LinearLayout>
<TextView android:id="@+id/download_item" android:gravity="top" android:layout_width="wrap_content" android:layout_height="wrap_content" <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" android:textSize="16sp"></TextView> 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" <TextView android:id="@+id/download_descr" android:layout_marginLeft="3dp" android:gravity="right" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:textSize="16sp" ></TextView> android:layout_height="wrap_content" style="@style/ListText.Small"></TextView>
</LinearLayout> </LinearLayout>

12
OsmAnd/res/layout/expandable_list_item_category.xml
View file

@ -2,25 +2,29 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" 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 <ImageView
android:id="@+id/explist_indicator" android:id="@+id/explist_indicator"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingLeft="10dp" android:paddingLeft="6dp"
android:src="@drawable/expandable_category_unpushed" /> android:src="@drawable/expandable_category_unpushed" />
<TextView <TextView
android:id="@+id/category_name" android:id="@+id/category_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10dp" android:layout_marginLeft="8dp"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:autoLink="web" android:autoLink="web"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textSize="22sp"> android:textSize="18sp">
</TextView> </TextView>
<LinearLayout <LinearLayout

1
OsmAnd/res/layout/list_menu_item.xml
View file

@ -7,7 +7,6 @@
android:layout_marginLeft="5dip" android:layout_marginLeft="5dip"
android:layout_marginRight="5dip" android:layout_marginRight="5dip"
android:background="@color/color_white"> android:background="@color/color_white">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"

2
OsmAnd/res/layout/local_index.xml
View file

@ -5,7 +5,7 @@
android:layout_height="fill_parent" android:orientation="vertical"> android:layout_height="fill_parent" android:orientation="vertical">
<TextView android:id="@+id/DescriptionText" android:layout_width="fill_parent" android:layout_height="wrap_content" <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"/> android:layout_marginRight="10dp" android:text="@string/download_link_and_local_description"/>
<ExpandableListView <ExpandableListView

21
OsmAnd/res/layout/local_index_list_item.xml
View file

@ -1,20 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:orientation="vertical"
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="fill_parent" android:layout_height="wrap_content">
<LinearLayout android:layout_width="wrap_content" 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" <CheckBox android:id="@+id/check_local_index" android:layout_width="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:focusable="false" /> android:gravity="center_vertical" android:focusable="false" />
</LinearLayout> </LinearLayout>
<TextView android:id="@+id/local_index_name" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" <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> 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"
<TextView android:id="@+id/local_index_size" android:layout_marginLeft="3dp" android:gravity="center_vertical" android:layout_width="75dp" android:layout_height="wrap_content" style="@style/ListText.Small"></TextView>
android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
</LinearLayout> </LinearLayout>
<TextView android:id="@+id/local_index_descr" android:layout_marginLeft="25dp" android:layout_marginTop="5dp" <TextView android:id="@+id/local_index_descr" android:gravity="center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_width="fill_parent" android:maxLines="7" style="@style/ListText.Small"></TextView>
android:layout_height="wrap_content" android:textSize="16sp" ></TextView>
</LinearLayout> </LinearLayout>

2
OsmAnd/res/layout/plugins.xml
View file

@ -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> <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" <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> </LinearLayout>

14
OsmAnd/res/layout/plugins_list_item.xml
View file

@ -5,6 +5,9 @@
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
android:background="?attr/expandable_category_color"
android:paddingTop="6dp"
android:paddingBottom="3dp"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="5dp" <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingLeft="5dp"
@ -17,10 +20,11 @@
android:id="@+id/plugin_name" android:id="@+id/plugin_name"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="top"
android:textStyle="bold" android:textStyle="bold"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
style="@style/ListText.Small" android:text="@string/extra_settings" style="@style/ListText" android:text="@string/extra_settings"
android:paddingLeft="5dp" android:paddingRight="10dp"> android:paddingRight="10dp">
</TextView> </TextView>
</LinearLayout> </LinearLayout>
<TextView <TextView
@ -31,7 +35,11 @@
android:maxLines="7" android:maxLines="7"
android:text="@string/osmand_extra_settings_description" android:text="@string/osmand_extra_settings_description"
android:textColor="?android:textColorSecondary" 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> </TextView>

4
OsmAnd/res/layout/searchbyname_list.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView android:id="@+id/NameLabel" android:layout_width="fill_parent" <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> </LinearLayout>

31
OsmAnd/res/layout/searchpoi_list.xml
View file

@ -1,16 +1,31 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_height="wrap_content"
android:orientation="horizontal"> android:paddingTop="6dp"
android:paddingBottom="6dp"
>
<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_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" />
<TextView android:id="@+id/poi_label" android:layout_width="wrap_content" <ImageView android:id="@+id/poi_icon" android:layout_width="26dp" android:layout_height="26dp"
android:layout_height="wrap_content" style="@style/ListText.Small"/> 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> </LinearLayout>

4
OsmAnd/res/layout/searchpoifolder_list.xml
View file

@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_width="fill_parent" android:layout_height="wrap_content"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView android:id="@+id/folder_icon" android:layout_width="37dip" <ImageView android:id="@+id/folder_icon" android:layout_width="37dip"
android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingLeft="8dp" android:paddingRight="8dp"
android:paddingTop="2dp" android:layout_height="fill_parent" /> android:paddingTop="2dp" android:layout_height="fill_parent" />
<TextView android:id="@+id/folder_label" android:layout_width="wrap_content" android:layout_weight="1" <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" <ImageView android:id="@+id/folder_edit_icon"
android:paddingLeft="4dp" android:paddingRight="8dp" android:src="@android:drawable/ic_input_get" android:paddingLeft="4dp" android:paddingRight="8dp" android:src="@android:drawable/ic_input_get"

4
OsmAnd/res/values/styles.xml
View file

@ -10,10 +10,10 @@
<style name="ListText"> <style name="ListText">
<item name="android:textSize">25sp</item> <item name="android:textSize">18sp</item>
</style> </style>
<style name="ListText.Small"> <style name="ListText.Small">
<item name="android:textSize">21sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="OsmandListView" parent="@android:style/Widget.ListView"> <style name="OsmandListView" parent="@android:style/Widget.ListView">