This commit is contained in:
Alexey Kulish 2016-07-06 11:01:46 +03:00
parent 73ad3413fa
commit 607f734a12

View file

@ -2,25 +2,19 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="bottom"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<FrameLayout
android:id="@+id/bottom_left_views"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true">
android:layout_gravity="bottom|left">
<!-- ALARM -->
@ -73,7 +67,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:visibility="gone"/>
android:visibility="gone"
tools:visibility="visible"/>
<LinearLayout
android:layout_width="wrap_content"
@ -102,61 +97,14 @@
tools:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</LinearLayout>
</FrameLayout>
<!-- RIGHT BUTTONS -->
<android.support.v4.widget.Space
android:id="@+id/space"
android:layout_width="0dp"
android:layout_height="@dimen/map_button_margin"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"/>
<ImageButton
android:id="@+id/map_zoom_out_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_above="@id/space"
android:layout_marginRight="@dimen/map_button_margin"
android:layout_marginTop="@dimen/map_button_margin"
android:layout_toLeftOf="@id/space"
android:background="@drawable/btn_circle"
android:contentDescription="@string/zoomOut"
tools:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_my_location_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_alignBottom="@id/map_zoom_out_button"
android:layout_marginLeft="@dimen/map_button_spacing_land"
android:layout_marginRight="@dimen/map_button_spacing_land"
android:layout_toLeftOf="@id/map_zoom_out_button"
android:background="@drawable/btn_circle"
android:contentDescription="@string/shared_string_my_location"
tools:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_zoom_in_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_above="@id/map_zoom_out_button"
android:layout_toRightOf="@id/map_my_location_button"
android:background="@drawable/btn_circle"
android:contentDescription="@string/zoomIn"
tools:src="@drawable/ic_action_test_light"/>
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/bottom_left_views"
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_toLeftOf="@id/map_my_location_button"
android:layout_toRightOf="@id/bottom_left_views"
android:layout_weight="1"
tools:visibility="gone">
android:layout_weight="1">
<!-- RULER -->
@ -259,10 +207,59 @@
tools:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>
</RelativeLayout>
<!-- RIGHT BUTTONS -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_spacing_land"
android:layout_marginRight="@dimen/map_button_margin">
<ImageButton
android:id="@+id/map_my_location_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_gravity="bottom"
android:background="@drawable/btn_circle"
android:contentDescription="@string/shared_string_my_location"
tools:src="@drawable/ic_action_test_light"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/map_button_spacing_land"
android:orientation="vertical">
<ImageButton
android:id="@+id/map_zoom_in_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_circle"
android:contentDescription="@string/zoomIn"
tools:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_zoom_out_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_marginTop="@dimen/map_button_spacing_land"
android:background="@drawable/btn_circle"
android:contentDescription="@string/zoomOut"
tools:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<include
layout="@layout/move_marker_bottom_sheet"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
tools:visibility="visible"/>
</LinearLayout>