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

Fixed misplaced right buttons.

Browse source
This commit is contained in:
GaidamakUA 2016-06-06 18:53:18 +03:00
parent 7c3699ae1e
commit e7e3cabb05
1 changed files with 222 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

430
OsmAnd/res/layout-land/map_hud_bottom.xml
View file

@ -1,254 +1,268 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="bottom" android:gravity="bottom"
android:orientation="horizontal"> android:layout_gravity="bottom"
android:orientation="vertical">
<FrameLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/bottom_left_views" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_above="@+id/move_marker_bottom_sheet" android:layout_weight="1"
android:layout_alignParentLeft="true"> android:layout_gravity="bottom"
android:orientation="horizontal">
<!-- ALARM -->
<FrameLayout <FrameLayout
android:id="@+id/map_alarm_warning" android:id="@+id/bottom_left_views"
android:layout_width="@dimen/map_alarm_size" android:layout_width="wrap_content"
android:layout_height="@dimen/map_alarm_size" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/map_alarm_bottom_margin_land" android:layout_alignParentLeft="true">
android:layout_marginLeft="@dimen/map_button_shadow_margin">
<ImageView <!-- ALARM -->
android:id="@+id/map_alarm_warning_icon"
android:layout_width="wrap_content" <FrameLayout
android:layout_height="wrap_content" android:id="@+id/map_alarm_warning"
android:layout_gravity="center" android:layout_width="@dimen/map_alarm_size"
android:src="@drawable/warnings_limit"/> android:layout_height="@dimen/map_alarm_size"
android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/map_alarm_bottom_margin_land"
android:layout_marginLeft="@dimen/map_button_shadow_margin">
<ImageView
android:id="@+id/map_alarm_warning_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/warnings_limit"/>
<TextView
android:id="@+id/map_alarm_warning_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@color/color_black"
android:textSize="@dimen/map_alarm_text_size"
android:textStyle="bold"
tools:text="60"/>
</FrameLayout>
<TextView <TextView
android:id="@+id/map_alarm_warning_text" android:id="@+id/map_app_mode_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="bottom"
android:textColor="@color/color_black" android:layout_marginBottom="130dp"
android:textSize="@dimen/map_alarm_text_size" android:layout_marginLeft="@dimen/map_button_margin"
android:textStyle="bold" android:gravity="center_horizontal"
tools:text="60"/> android:textSize="@dimen/map_button_text_size"
</FrameLayout> tools:text="13.88"/>
<TextView
android:id="@+id/map_app_mode_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="130dp"
android:layout_marginLeft="@dimen/map_button_margin"
android:gravity="center_horizontal"
android:textSize="@dimen/map_button_text_size"
tools:text="13.88"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left">
<!-- PREPARATION SCREEN -->
<include
layout="@layout/recording_note_fragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:visibility="gone"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left">
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_spacing_land"
android:orientation="horizontal">
<ImageButton <!-- PREPARATION SCREEN -->
android:id="@+id/map_menu_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_round"
android:contentDescription="@string/backToMenu"
tools:src="@drawable/ic_action_test_light"/>
<ImageButton <include
android:id="@+id/map_route_info_button" layout="@layout/recording_note_fragment"
android:layout_width="@dimen/map_button_size" android:layout_width="wrap_content"
android:layout_height="@dimen/map_button_size" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/map_button_spacing_land" android:layout_gravity="bottom|left"
android:background="@drawable/btn_round" android:visibility="gone"/>
android:contentDescription="@string/layer_route"
tools:src="@drawable/ic_action_test_light"/> <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_spacing_land"
android:orientation="horizontal">
<ImageButton
android:id="@+id/map_menu_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/btn_round"
android:contentDescription="@string/backToMenu"
tools:src="@drawable/ic_action_test_light"/>
<ImageButton
android:id="@+id/map_route_info_button"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:layout_marginLeft="@dimen/map_button_spacing_land"
android:background="@drawable/btn_round"
android:contentDescription="@string/layer_route"
tools:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</FrameLayout> </FrameLayout>
<!-- RIGHT BUTTONS --> <!-- RIGHT BUTTONS -->
<ImageButton <android.support.v4.widget.Space
android:id="@+id/map_zoom_out_button" android:id="@+id/space"
android:layout_width="@dimen/map_button_size" android:layout_width="0dp"
android:layout_height="@dimen/map_button_size" android:layout_height="@dimen/map_button_margin"
android:layout_alignBottom="@id/bottom_left_views" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"/>
android:layout_marginBottom="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_margin"
android:layout_marginTop="@dimen/map_button_margin"
android:background="@drawable/btn_circle"
android:contentDescription="@string/zoomOut"
tools:src="@drawable/ic_action_test_light"/>
<ImageButton <ImageButton
android:id="@+id/map_my_location_button" android:id="@+id/map_zoom_out_button"
android:layout_width="@dimen/map_button_size" android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size" android:layout_height="@dimen/map_button_size"
android:layout_alignBottom="@id/bottom_left_views" android:layout_above="@id/space"
android:layout_marginBottom="@dimen/map_button_margin" android:layout_marginRight="@dimen/map_button_margin"
android:layout_marginLeft="@dimen/map_button_spacing_land" android:layout_marginTop="@dimen/map_button_margin"
android:layout_marginRight="@dimen/map_button_spacing_land" android:layout_toLeftOf="@id/space"
android:layout_toLeftOf="@id/map_zoom_out_button" android:background="@drawable/btn_circle"
android:background="@drawable/btn_circle" android:contentDescription="@string/zoomOut"
android:contentDescription="@string/shared_string_my_location" tools:src="@drawable/ic_action_test_light"/>
tools:src="@drawable/ic_action_test_light"/>
<ImageButton <ImageButton
android:id="@+id/map_zoom_in_button" android:id="@+id/map_my_location_button"
android:layout_width="@dimen/map_button_size" android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size" android:layout_height="@dimen/map_button_size"
android:layout_above="@id/map_zoom_out_button" android:layout_alignBottom="@id/map_zoom_out_button"
android:layout_toRightOf="@id/map_my_location_button" android:layout_marginLeft="@dimen/map_button_spacing_land"
android:background="@drawable/btn_circle" android:layout_marginRight="@dimen/map_button_spacing_land"
android:contentDescription="@string/zoomIn" android:layout_toLeftOf="@id/map_zoom_out_button"
tools:src="@drawable/ic_action_test_light"/> android:background="@drawable/btn_circle"
android:contentDescription="@string/shared_string_my_location"
tools:src="@drawable/ic_action_test_light"/>
<FrameLayout <ImageButton
android:layout_width="0dp" android:id="@+id/map_zoom_in_button"
android:layout_height="wrap_content" android:layout_width="@dimen/map_button_size"
android:layout_alignBottom="@id/bottom_left_views" android:layout_height="@dimen/map_button_size"
android:layout_gravity="bottom" android:layout_above="@id/map_zoom_out_button"
android:layout_marginBottom="@dimen/map_button_margin" android:layout_toRightOf="@id/map_my_location_button"
android:layout_toLeftOf="@id/map_my_location_button" android:background="@drawable/btn_circle"
android:layout_toRightOf="@id/bottom_left_views" android:contentDescription="@string/zoomIn"
android:layout_weight="1"> tools:src="@drawable/ic_action_test_light"/>
<!-- RULER -->
<FrameLayout <FrameLayout
android:id="@+id/map_ruler_layout" android:layout_width="0dp"
android:layout_width="@dimen/map_ruler_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom"> 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">
<!-- RULER -->
<FrameLayout <FrameLayout
android:layout_width="fill_parent" android:id="@+id/map_ruler_layout"
android:layout_height="fill_parent" android:layout_width="@dimen/map_ruler_width"
android:layout_marginBottom="@dimen/map_ruler_bottom_margin"> android:layout_height="wrap_content"
android:layout_gravity="bottom">
<TextView <FrameLayout
android:id="@+id/map_ruler_text_shadow"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="bottom" android:layout_marginBottom="@dimen/map_ruler_bottom_margin">
android:gravity="center_horizontal"
android:lineSpacingMultiplier="0.9"
android:textSize="@dimen/map_widget_text_size_small"
tools:text="100 m"/>
<TextView <TextView
android:id="@+id/map_ruler_text" android:id="@+id/map_ruler_text_shadow"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="bottom"
android:gravity="center_horizontal"
android:lineSpacingMultiplier="0.9"
android:textSize="@dimen/map_widget_text_size_small"
tools:text="100 m"/>
<TextView
android:id="@+id/map_ruler_text"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="bottom"
android:gravity="center_horizontal"
android:lineSpacingMultiplier="0.9"
android:textSize="@dimen/map_widget_text_size_small"
tools:text="100 m"/>
</FrameLayout>
<ImageView
android:id="@+id/map_ruler_image"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="center_horizontal" android:background="@drawable/ruler"/>
android:lineSpacingMultiplier="0.9"
android:textSize="@dimen/map_widget_text_size_small"
tools:text="100 m"/>
</FrameLayout> </FrameLayout>
<ImageView <!-- TRANSPARENCY -->
android:id="@+id/map_ruler_image"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="@drawable/ruler"/>
</FrameLayout>
<!-- TRANSPARENCY --> <LinearLayout
android:id="@+id/map_transparency_layout"
<LinearLayout
android:id="@+id/map_transparency_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:layout_marginBottom="@dimen/map_button_size"
android:orientation="horizontal">
<SeekBar
android:id="@+id/map_transparency_seekbar"
android:layout_width="@dimen/map_trans_seek_size"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<ImageButton
android:id="@+id/map_transparency_hide"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="bottom|center"
android:background="@drawable/btn_circle_transparent" android:layout_marginBottom="@dimen/map_button_size"
android:contentDescription="@string/shared_string_hide" android:orientation="horizontal">
android:src="@drawable/headliner_close"/>
</LinearLayout>
<!-- CONTEXT MENU --> <SeekBar
android:id="@+id/map_transparency_seekbar"
android:layout_width="@dimen/map_trans_seek_size"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<LinearLayout <ImageButton
android:id="@+id/map_context_menu_layout" android:id="@+id/map_transparency_hide"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="center"
android:background="@drawable/btn_flat" android:background="@drawable/btn_circle_transparent"
android:visibility="gone"> android:contentDescription="@string/shared_string_hide"
android:src="@drawable/headliner_close"/>
</LinearLayout>
<TextView <!-- CONTEXT MENU -->
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center">
</TextView>
<ImageButton <LinearLayout
android:layout_width="@dimen/map_address_height" android:id="@+id/map_context_menu_layout"
android:layout_height="@dimen/map_address_height" android:layout_width="match_parent"
android:layout_gravity="center_vertical" android:layout_height="wrap_content"
android:background="@drawable/btn_circle_transparent" android:layout_gravity="bottom"
tools:src="@drawable/ic_action_test_light"/> android:background="@drawable/btn_flat"
android:visibility="gone">
<ImageButton <TextView
android:layout_width="@dimen/map_address_height" android:layout_width="0dp"
android:layout_height="@dimen/map_address_height" android:layout_height="fill_parent"
android:layout_gravity="center_vertical" android:layout_weight="1"
android:background="@drawable/btn_circle_transparent" android:ellipsize="end"
tools:src="@drawable/ic_action_test_light"/> android:gravity="center">
</LinearLayout> </TextView>
</FrameLayout>
<ImageButton
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:layout_gravity="center_vertical"
android:background="@drawable/btn_circle_transparent"
tools:src="@drawable/ic_action_test_light"/>
<ImageButton
android:layout_width="@dimen/map_address_height"
android:layout_height="@dimen/map_address_height"
android:layout_gravity="center_vertical"
android:background="@drawable/btn_circle_transparent"
tools:src="@drawable/ic_action_test_light"/>
</LinearLayout>
</FrameLayout>
</RelativeLayout>
<include <include
layout="@layout/move_marker_bottom_sheet" layout="@layout/move_marker_bottom_sheet"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"/>
android:layout_alignParentBottom="true"/> </LinearLayout>
</RelativeLayout>