fix layouts

git-svn-id: https://osmand.googlecode.com/svn/trunk@773 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8
This commit is contained in:
Victor Shcherb 2010-12-06 13:58:16 +00:00
parent 6fc9092607
commit 6310a2c619
52 changed files with 318 additions and 16 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 223 KiB

After

Width:  |  Height:  |  Size: 203 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View file

@ -30,9 +30,9 @@
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
android:text="@string/map_Button" android:typeface="serif" android:textColor="#000000"
android:text="@string/map_Button" android:textColor="#000000"
android:layout_weight="1"
android:textSize="18sp"/>
android:textSize="16sp"/>
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
@ -50,15 +50,16 @@
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_width="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginLeft="35dp"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
android:text="@string/search_button" android:typeface="serif" android:textColor="#000000"
android:textSize="18sp"/>
android:text="@string/search_button" android:textColor="#000000"
android:textSize="16sp"/>
</LinearLayout>
</TableRow>
<TableRow android:layout_height = "wrap_content" >
@ -67,9 +68,9 @@
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
android:layout_gravity="center_vertical|left"
android:text="@string/favorites_Button" android:typeface="serif" android:textColor="#000000"
android:text="@string/favorites_Button" android:textColor="#000000"
android:layout_weight="1"
android:textSize="18sp"/>
android:textSize="16sp"/>
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
@ -85,16 +86,17 @@
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_marginLeft="15dp"
android:layout_marginLeft="35dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical|right"
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
android:text="@string/settings_Button" android:typeface="serif" android:textColor="#000000"
android:textSize="18sp"/>
android:text="@string/settings_Button" android:textColor="#000000"
android:textSize="16sp"/>
</LinearLayout>
</TableRow>

View file

@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:background="@drawable/background">
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" >
<LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/headliner" android:orientation="horizontal" android:id="@+id/Headliner" >
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="5dp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="8dp"
android:text="OsmAnd" android:textColor="#000000" android:typeface="serif" android:textSize="22sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="8dp"
android:text="0.5.1 beta(b6)" android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion"
android:textSize="20sp"/>
<ImageView android:src="@drawable/headline_close_button" android:layout_marginRight="10dp" android:clickable="true"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="5dp"/>
</LinearLayout>
</LinearLayout>
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<TableRow android:layout_height = "wrap_content" >
<LinearLayout android:id="@+id/MapButton" android:background="@drawable/button_left" android:orientation="vertical" android:clickable="true"
android:layout_width="240dp" android:layout_height="294dp">
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="45dp" android:layout_marginRight="24dp"
android:text="@string/map_Button" android:typeface="serif" android:textColor="#000000"
android:textSize="27sp"/>
</LinearLayout>
<LinearLayout android:layout_weight="1" android:layout_height="fill_parent" />
<LinearLayout android:id="@+id/SearchButton" android:background="@drawable/button_right" android:orientation="vertical" android:clickable="true"
android:layout_width="240dp" android:layout_height="294dp">
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_gravity="center_vertical|right"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="45dp" android:layout_marginLeft="24dp"
android:text="@string/search_button" android:typeface="serif" android:textColor="#000000"
android:textSize="27sp"/>
</LinearLayout>
</TableRow>
<TableRow android:layout_height = "wrap_content" >
<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/button_left" android:orientation="vertical"
android:layout_width="240dp" android:layout_height="294dp">
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_gravity="top"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="45dp" android:layout_marginRight="24dp"
android:text="@string/favorites_Button" android:typeface="serif" android:textColor="#000000"
android:textSize="27sp"/>
</LinearLayout>
<LinearLayout android:layout_weight="1" android:layout_height="fill_parent" />
<LinearLayout android:id="@+id/SettingsButton" android:background="@drawable/button_right" android:orientation="vertical"
android:layout_width="240dp" android:layout_height="294dp">
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="45dp" android:layout_marginLeft="24dp"
android:text="@string/settings_Button" android:typeface="serif" android:textColor="#000000"
android:textSize="27sp"/>
</LinearLayout>
</TableRow>
</TableLayout>
</LinearLayout>
</FrameLayout>

View file

@ -0,0 +1,106 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:background="@drawable/background">
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" >
<LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/headliner" android:orientation="horizontal" android:id="@+id/Headliner" >
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="5dp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="5dp"
android:text="OsmAnd" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="5dp"
android:text="0.5.1 beta(b6)" android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion"
android:textSize="13sp"/>
<ImageView android:src="@drawable/headline_close_button" android:layout_marginRight="10dp"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="5dp"/>
</LinearLayout>
</LinearLayout>
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<TableRow android:layout_height = "wrap_content" >
<LinearLayout android:id="@+id/MapButton" android:background="@drawable/button_left" android:clickable="true"
android:layout_width="220dp" android:layout_height="111dp">
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
android:text="@string/map_Button" android:textColor="#000000"
android:layout_weight="1"
android:textSize="16sp"/>
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_marginRight="30dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout android:layout_weight="1" android:layout_height="fill_parent" />
<LinearLayout android:id="@+id/SearchButton" android:background="@drawable/button_right" android:clickable="true"
android:layout_width="220dp" android:layout_height="111dp">
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_width="wrap_content"
android:layout_marginLeft="35dp"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
android:text="@string/search_button" android:textColor="#000000"
android:textSize="16sp"/>
</LinearLayout>
</TableRow>
<TableRow android:layout_height = "wrap_content" >
<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/button_left"
android:layout_width="220dp" android:layout_height="111dp">
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginBottom="5dp"
android:layout_gravity="center_vertical|left"
android:text="@string/favorites_Button" android:textColor="#000000"
android:layout_weight="1"
android:textSize="16sp"/>
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_marginRight="30dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<LinearLayout android:layout_weight="1" android:layout_height="fill_parent" />
<LinearLayout android:id="@+id/SettingsButton" android:background="@drawable/button_right"
android:layout_width="220dp" android:layout_height="111dp">
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|left"
android:layout_marginLeft="35dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_vertical|right"
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="15dp" android:layout_marginBottom="5dp"
android:text="@string/settings_Button" android:textColor="#000000"
android:textSize="16sp"/>
</LinearLayout>
</TableRow>
</TableLayout>
</LinearLayout>
</FrameLayout>

View file

@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:background="@drawable/background">
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="center_horizontal" >
<LinearLayout android:layout_height="wrap_content" android:layout_width="wrap_content"
android:background="@drawable/headliner" android:orientation="horizontal" android:id="@+id/Headliner" >
<ImageView android:src="@drawable/headline_osmand_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="5dp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginLeft="0dp" android:layout_weight="1" android:layout_marginTop="5dp"
android:text="OsmAnd" android:textColor="#000000" android:typeface="serif" android:textSize="20sp"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginTop="5dp"
android:text="0.5.1 beta(b6)" android:textColor="#000000" android:typeface="serif" android:id="@+id/TextVersion"
android:textSize="13sp"/>
<ImageView android:src="@drawable/headline_close_button" android:layout_marginRight="10dp" android:clickable="true"
android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginLeft="5dp"/>
</LinearLayout>
</LinearLayout>
<TableLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
<TableRow android:layout_height = "wrap_content" >
<LinearLayout android:id="@+id/MapButton" android:background="@drawable/button_left" android:orientation="vertical" android:clickable="true"
android:layout_width="145dp" android:layout_height="178dp">
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="30dp" android:layout_marginRight="15dp"
android:text="@string/map_Button" android:typeface="serif" android:textColor="#000000"
android:textSize="18sp"/>
</LinearLayout>
<LinearLayout android:layout_weight="1" android:layout_height="fill_parent" />
<LinearLayout android:id="@+id/SearchButton" android:background="@drawable/button_right" android:orientation="vertical" android:clickable="true"
android:layout_width="145dp" android:layout_height="178dp">
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_gravity="center_vertical|right"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="30dp" android:layout_marginLeft="15dp"
android:text="@string/search_button" android:typeface="serif" android:textColor="#000000"
android:textSize="18sp"/>
</LinearLayout>
</TableRow>
<TableRow android:layout_height = "wrap_content" >
<LinearLayout android:id="@+id/FavoritesButton" android:background="@drawable/button_left" android:orientation="vertical"
android:layout_width="145dp" android:layout_height="178dp">
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_gravity="top"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="30dp" android:layout_marginRight="15dp"
android:text="@string/favorites_Button" android:typeface="serif" android:textColor="#000000"
android:textSize="18sp"/>
</LinearLayout>
<LinearLayout android:layout_weight="1" android:layout_height="fill_parent" />
<LinearLayout android:id="@+id/SettingsButton" android:background="@drawable/button_right" android:orientation="vertical"
android:layout_width="145dp" android:layout_height="178dp">
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_gravity="top|right"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<TextView android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="30dp" android:layout_marginLeft="15dp"
android:text="@string/settings_Button" android:typeface="serif" android:textColor="#000000"
android:textSize="18sp"/>
</LinearLayout>
</TableRow>
</TableLayout>
</LinearLayout>
</FrameLayout>

View file

@ -30,7 +30,6 @@
<ImageView
android:src="@drawable/button_icon_map"
android:scaleType="center"
android:layout_marginTop="20dp"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_width="wrap_content"
@ -47,7 +46,6 @@
<ImageView
android:src="@drawable/button_icon_search"
android:scaleType="center"
android:layout_marginTop="20dp"
android:layout_gravity="center_vertical|right"
android:layout_weight="1"
android:layout_width="wrap_content"
@ -66,8 +64,7 @@
<ImageView
android:src="@drawable/button_icon_favorites"
android:scaleType="center"
android:layout_marginTop="20dp"
android:layout_gravity="center_vertical"
android:layout_gravity="top"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -83,8 +80,7 @@
<ImageView
android:src="@drawable/button_icon_settings"
android:scaleType="center"
android:layout_marginTop="20dp"
android:layout_gravity="center_vertical|right"
android:layout_gravity="top|right"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>