Fix the "map_context_menu_fragment" layout formatting

(cherry picked from commit 2624deb)
This commit is contained in:
Alex Sytnyk 2018-08-01 12:35:08 +03:00
parent ee778a686c
commit 65153ba598

View file

@ -99,26 +99,26 @@
android:paddingTop="3dp"> android:paddingTop="3dp">
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx
android:layout_gravity="center_vertical"
android:id="@+id/nearby_routes_within_text_view" android:id="@+id/nearby_routes_within_text_view"
style="@style/TextAppearance.ContextMenuSubtitle" style="@style/TextAppearance.ContextMenuSubtitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/context_menu_padding_margin_small" android:layout_marginEnd="@dimen/context_menu_padding_margin_small"
android:layout_marginRight="@dimen/context_menu_padding_margin_small" android:layout_marginRight="@dimen/context_menu_padding_margin_small"
android:textSize="@dimen/default_sub_text_size" android:textSize="@dimen/default_sub_text_size"
osmand:typeface="@string/font_roboto_medium" /> osmand:typeface="@string/font_roboto_medium"/>
<GridView <GridView
android:layout_gravity="center_vertical"
android:id="@+id/transport_stop_nearby_routes_grid" android:id="@+id/transport_stop_nearby_routes_grid"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:columnWidth="@dimen/context_menu_transport_grid_item_width" android:columnWidth="@dimen/context_menu_transport_grid_item_width"
android:horizontalSpacing="@dimen/context_menu_transport_grid_spacing" android:horizontalSpacing="@dimen/context_menu_transport_grid_spacing"
android:numColumns="auto_fit" android:numColumns="auto_fit"
android:verticalSpacing="@dimen/context_menu_transport_grid_spacing" android:verticalSpacing="@dimen/context_menu_transport_grid_spacing"
android:visibility="gone" /> android:visibility="gone"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -126,82 +126,82 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height= "wrap_content"
android:layout_marginBottom="@dimen/context_menu_direction_margin"
android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
android:gravity="top"
android:orientation="horizontal"
android:paddingTop="3dp"
android:paddingBottom="3dp"
android:paddingLeft="@dimen/context_menu_padding_margin_default"
android:paddingRight="@dimen/context_menu_padding_margin_default">
<LinearLayout <LinearLayout
android:id="@+id/additional_info_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/context_menu_line3"
style="@style/TextAppearance.ContextMenuSubtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/context_menu_padding_margin_small"
android:layout_marginRight="@dimen/context_menu_padding_margin_small"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
osmand:typeface="@string/font_roboto_medium"
tools:text="Some really long string"/>
<ImageView
android:id="@+id/additional_info_image_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_marginBottom="@dimen/context_menu_direction_margin"
android:paddingTop="1dp" android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
android:paddingRight="@dimen/context_menu_padding_margin_small" android:gravity="top"
tools:src="@drawable/ic_action_opening_hour_16"/> android:orientation="horizontal"
android:paddingBottom="3dp"
android:paddingLeft="@dimen/context_menu_padding_margin_default"
android:paddingRight="@dimen/context_menu_padding_margin_default"
android:paddingTop="3dp">
<TextView <LinearLayout
android:id="@+id/additional_info_text_view" android:id="@+id/additional_info_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/context_menu_padding_margin_small"
android:layout_marginRight="@dimen/context_menu_padding_margin_small"
tools:text="Closed till 10:00"/>
<LinearLayout
android:id="@+id/compass_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/direction"
android:layout_width="@dimen/directionIconSize"
android:layout_height="@dimen/directionIconSize"
android:layout_gravity="center_vertical"
android:layout_marginTop="1sp"
tools:src="@drawable/ic_direction_arrow"/>
<TextView
android:id="@+id/distance"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_gravity="center_vertical"
android:layout_marginLeft="2dp" <net.osmand.plus.widgets.TextViewEx
android:layout_marginStart="2dp" android:id="@+id/context_menu_line3"
android:textSize="@dimen/default_desc_text_size" style="@style/TextAppearance.ContextMenuSubtitle"
tools:text="100500 km" android:layout_width="0dp"
tools:textColor="?android:textColorSecondary"/> android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/context_menu_padding_margin_small"
android:layout_marginRight="@dimen/context_menu_padding_margin_small"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
osmand:typeface="@string/font_roboto_medium"
tools:text="Some really long string"/>
<ImageView
android:id="@+id/additional_info_image_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingRight="@dimen/context_menu_padding_margin_small"
android:paddingTop="1dp"
tools:src="@drawable/ic_action_opening_hour_16"/>
<TextView
android:id="@+id/additional_info_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/context_menu_padding_margin_small"
android:layout_marginRight="@dimen/context_menu_padding_margin_small"
tools:text="Closed till 10:00"/>
<LinearLayout
android:id="@+id/compass_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/direction"
android:layout_width="@dimen/directionIconSize"
android:layout_height="@dimen/directionIconSize"
android:layout_gravity="center_vertical"
android:layout_marginTop="1sp"
tools:src="@drawable/ic_direction_arrow"/>
<TextView
android:id="@+id/distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:textSize="@dimen/default_desc_text_size"
tools:text="100500 km"
tools:textColor="?android:textColorSecondary"/>
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
@ -723,13 +723,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left" android:layout_gravity="left"
android:scaleType="center"
android:textColor="@color/abc_primary_text_material_dark"
android:textSize="@dimen/abc_text_size_large_material"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:maxLines="1" android:maxLines="1"
android:scaleType="center"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/abc_primary_text_material_dark"
android:textSize="@dimen/abc_text_size_large_material"
tools:text="Toolbar" tools:text="Toolbar"
tools:visibility="visible"/> tools:visibility="visible"/>