UI routing fix.

This commit is contained in:
Dmitry Yunitsky 2014-10-15 13:10:53 +03:00 committed by Alex Zolotarev
parent 36e7a765b9
commit 1799285cb0
4 changed files with 25 additions and 16 deletions

View file

@ -28,27 +28,33 @@
android:layout_width="match_parent"
android:layout_height="@dimen/routing_pp_height"
android:layout_alignParentTop="true"
android:background="@android:color/transparent">
android:background="@android:color/transparent"
android:paddingLeft="@dimen/margin_tiny_and_half"
android:paddingRight="@dimen/margin_tiny_and_half"
android:paddingTop="@dimen/margin_tiny">
<LinearLayout
android:id="@+id/ll__routing_go"
android:layout_width="wrap_content"
android:layout_height="@dimen/routing_button_height"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/margin_medium"
android:layout_marginRight="@dimen/margin_tiny"
android:layout_toLeftOf="@+id/iv__routing_close"
android:background="@drawable/ic_route_bg"
android:gravity="center_vertical"
android:paddingRight="@dimen/margin_small"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_small_and_half"
android:paddingRight="@dimen/margin_small_and_half">
<TextView
android:id="@+id/tv__routing_go"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/margin_medium"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/margin_small"
android:gravity="center"
android:text="@string/routing_go"
android:textColor="@color/downloader_green"/>
android:textColor="@color/downloader_green"
android:textSize="18sp"/>
<ImageView
android:layout_width="wrap_content"
@ -59,11 +65,10 @@
<ImageView
android:id="@+id/iv__routing_close"
android:layout_width="@dimen/routing_button_height"
android:layout_width="@dimen/routing_button_width"
android:layout_height="@dimen/routing_button_height"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/margin_small"
android:background="@drawable/ic_route_bg"
android:padding="@dimen/margin_medium"
android:scaleType="center"
@ -75,7 +80,6 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/routing_button_height"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/margin_small"
android:background="@drawable/ic_route_bg"
android:gravity="center"
android:paddingLeft="@dimen/margin_small"

View file

@ -5,8 +5,7 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="top"
android:orientation="vertical"
android:paddingRight="@dimen/zoom_margin_right">
android:orientation="vertical">
<ImageButton
android:id="@+id/yop_it"
@ -14,6 +13,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/margin_tiny"
android:src="@drawable/ic_btn_yota_ptb"/>
<View
@ -21,7 +21,8 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerVertical="true"
android:layout_marginBottom="-30dp"/>
android:layout_marginBottom="-30dp"
android:layout_marginRight="@dimen/margin_tiny"/>
<ImageButton
android:id="@+id/map_button_plus"

View file

@ -10,7 +10,9 @@
<dimen name="margin_micro">2dp</dimen>
<dimen name="margin_tiny">4dp</dimen>
<dimen name="margin_tiny_and_half">6dp</dimen>
<dimen name="margin_small">8dp</dimen>
<dimen name="margin_small_and_half">12dp</dimen>
<dimen name="margin_medium">16dp</dimen>
<dimen name="margin_large">32dp</dimen>
@ -35,7 +37,7 @@
<dimen name="color_chooser_radius">24dp</dimen>
<dimen name="dialog_max_height">320dp</dimen>
<dimen name="zoom_plus_top_margin">0dp</dimen>
<dimen name="zoom_margin">5dp</dimen>
<dimen name="zoom_margin">6dp</dimen>
<dimen name="zoom_margin_right">4dp</dimen>
<dimen name="map_controls_margin">7dp</dimen>
<dimen name="bottom_panel_height">46dp</dimen>
@ -51,8 +53,10 @@
<dimen name="progress_wheel_width_neg">-48dp</dimen>
<dimen name="bg_downloader_radius">6dp</dimen>
<dimen name="bg_downloader_size">16dp</dimen>
<dimen name="routing_pp_height">80dp</dimen>
<dimen name="routing_pp_height">46dp</dimen>
<dimen name="routing_button_height">42dp</dimen>
<dimen name="routing_button_width">42dp</dimen>
<dimen name="routing_progress_size">32dp</dimen>
</resources>

View file

@ -10,7 +10,7 @@
<style name="Widget.MapButtonZoom" parent="android:Widget.Holo.ImageButton">
<item name="android:background">@drawable/btn_zoom_bg_selector</item>
<item name="android:layout_margin">@dimen/zoom_margin</item>
<item name="android:layout_marginBottom">@dimen/zoom_margin</item>
<item name="android:layout_marginBottom">0dp</item>
<item name="android:padding">0dp</item>
</style>