diff options
author | Dmitry Yunitsky <yunik@mapswithme.com> | 2015-05-25 12:58:24 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:48:31 +0300 |
commit | 511957592343b66dcbb0fb0e492bd4da9d0cdb81 (patch) | |
tree | b072de3ed107c997c9cb9b30993163c068b14036 /android/res/layout | |
parent | 3b63e003adb7f0d36efe482e215e0268d17d37e8 (diff) |
Buttons animations tweaks.
Diffstat (limited to 'android/res/layout')
-rw-r--r-- | android/res/layout/activity_map.xml | 9 | ||||
-rw-r--r-- | android/res/layout/map_bottom_vertical_toolbar.xml | 89 | ||||
-rw-r--r-- | android/res/layout/map_navigation_buttons.xml | 25 |
3 files changed, 17 insertions, 106 deletions
diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml index 5014a4ba69..b33fbfd806 100644 --- a/android/res/layout/activity_map.xml +++ b/android/res/layout/activity_map.xml @@ -42,9 +42,7 @@ <include android:id="@+id/navigation_buttons" - layout="@layout/map_navigation_buttons" - android:layout_width="match_parent" - android:layout_height="match_parent"/> + layout="@layout/map_navigation_buttons"/> <com.mapswithme.maps.widget.FadeView android:id="@+id/fade_view" @@ -55,8 +53,5 @@ <include android:id="@+id/map_bottom_buttons" - layout="@layout/map_bottom_buttons" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentBottom="true"/> + layout="@layout/map_bottom_buttons"/> </RelativeLayout>
\ No newline at end of file diff --git a/android/res/layout/map_bottom_vertical_toolbar.xml b/android/res/layout/map_bottom_vertical_toolbar.xml deleted file mode 100644 index bebddb35f4..0000000000 --- a/android/res/layout/map_bottom_vertical_toolbar.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/bg_bottom_toolbar" - android:orientation="vertical"> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="@dimen/bottom_item_height"> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginLeft="@dimen/margin_medium" - android:background="@drawable/ic_menu_download" - android:scaleType="center"/> - - <TextView - android:id="@+id/btn_download_maps" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/clickableBackground" - android:fontFamily="@string/robotoLight" - android:gravity="center_vertical" - android:paddingLeft="@dimen/margin_large_and_half" - android:text="@string/download_maps" - android:textAppearance="@style/TextAppearance.AppCompat.Medium" - android:textColor="@color/text_dark"/> - - </RelativeLayout> - - <View - style="@style/MwmWidget.DividerMediumPadded"/> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="@dimen/bottom_item_height"> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginLeft="@dimen/margin_medium" - android:background="@drawable/ic_menu_settings" - android:scaleType="center"/> - - <TextView - android:id="@+id/btn_settings" - android:layout_width="match_parent" - android:layout_height="@dimen/bottom_item_height" - android:background="?attr/clickableBackground" - android:fontFamily="@string/robotoLight" - android:gravity="center_vertical" - android:paddingLeft="@dimen/margin_large_and_half" - android:text="@string/settings_and_more" - android:textAppearance="@style/TextAppearance.AppCompat.Medium" - android:textColor="@color/text_dark"/> - - </RelativeLayout> - - <View - style="@style/MwmWidget.DividerMediumPadded"/> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="@dimen/bottom_item_height"> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginLeft="@dimen/margin_medium" - android:background="@drawable/ic_menu_send_my_location" - android:scaleType="center"/> - - <TextView - android:id="@+id/btn_share" - android:layout_width="match_parent" - android:layout_height="@dimen/bottom_item_height" - android:background="?attr/clickableBackground" - android:fontFamily="@string/robotoLight" - android:gravity="center_vertical" - android:paddingLeft="@dimen/margin_large_and_half" - android:text="@string/share_my_location" - android:textAppearance="@style/TextAppearance.AppCompat.Medium" - android:textColor="@color/text_dark"/> - - </RelativeLayout> -</LinearLayout> diff --git a/android/res/layout/map_navigation_buttons.xml b/android/res/layout/map_navigation_buttons.xml index 9224a1b824..553cfe4596 100644 --- a/android/res/layout/map_navigation_buttons.xml +++ b/android/res/layout/map_navigation_buttons.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="match_parent" android:padding="@dimen/margin_small"> @@ -17,19 +17,24 @@ android:layout_alignParentRight="true" android:src="@drawable/ic_btn_yota_ptb"/> - <ImageButton - android:id="@+id/map_button_plus" - style="@style/MwmWidget.MapButton.White" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:layout_marginBottom="250dp" - android:src="@drawable/btn_white_zoom_in"/> + <android.support.v4.widget.Space + android:id="@+id/space_bottom" + android:layout_width="0dp" + android:layout_height="250dp" + android:layout_alignParentBottom="true"/> <ImageButton android:id="@+id/map_button_minus" - style="@style/MwmWidget.MapButton.White" + style="@style/MwmWidget.MapButton.Zoom" + android:layout_above="@id/space_bottom" android:layout_alignParentRight="true" - android:layout_below="@+id/map_button_plus" android:src="@drawable/btn_white_zoom_out"/> + <ImageButton + android:id="@+id/map_button_plus" + style="@style/MwmWidget.MapButton.Zoom" + android:layout_above="@id/map_button_minus" + android:layout_alignParentRight="true" + android:src="@drawable/btn_white_zoom_in"/> + </RelativeLayout> |