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

Merge pull request #4601 from osmandapp/marker_history_menu_fix

Browse source 
Marker history menu fix
This commit is contained in:
Alexey 2017-10-17 21:12:41 +03:00 committed by GitHub
commit aa2a763736
1 changed files with 135 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

272
OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml
View file

@ -1,163 +1,161 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:osmand="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="wrap_content" android:layout_width="match_parent"
xmlns:osmand="http://schemas.android.com/apk/res-auto" android:layout_height="wrap_content"
android:background="?attr/bg_color" android:background="?attr/bg_color"
android:orientation="vertical"> android:orientation="vertical">
<ScrollView <ScrollView
android:id="@+id/history_marker_scroll_view" android:id="@+id/history_marker_scroll_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp"> android:paddingBottom="8dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_selected_item_title_height" android:layout_height="@dimen/bottom_sheet_selected_item_title_height"
android:minHeight="@dimen/bottom_sheet_selected_item_title_height" android:gravity="center_vertical"
android:gravity="center_vertical" android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="@dimen/bottom_sheet_content_padding" android:paddingEnd="@dimen/bottom_sheet_content_padding"
android:paddingLeft="@dimen/bottom_sheet_content_padding" android:paddingLeft="@dimen/bottom_sheet_content_padding"
android:paddingRight="@dimen/bottom_sheet_content_padding" android:paddingRight="@dimen/bottom_sheet_content_padding"
android:paddingStart="@dimen/bottom_sheet_content_padding"> android:paddingStart="@dimen/bottom_sheet_content_padding">
<ImageView <ImageView
android:id="@+id/map_marker_icon" android:id="@+id/map_marker_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin" android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin" android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
tools:src="@drawable/ic_action_flag_dark"/> tools:src="@drawable/ic_action_flag_dark"/>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<net.osmand.plus.widgets.TextViewEx <android.support.v7.widget.AppCompatTextView
osmand:typeface="@string/font_roboto_regular" android:id="@+id/map_marker_title"
android:id="@+id/map_marker_title" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textSize="@dimen/default_list_text_size"
android:textColor="?android:textColorPrimary"
tools:text="Bloemstraat 179"/>
<net.osmand.plus.widgets.TextViewEx
osmand:typeface="@string/font_roboto_regular"
android:id="@+id/map_marker_passed_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_list_text_size" android:textSize="@dimen/default_list_text_size"
android:textColor="?android:textColorSecondary" tools:text="Bloemstraat 179"/>
tools:text="Passed: July 28"/>
</LinearLayout> <android.support.v7.widget.AppCompatTextView
android:id="@+id/map_marker_passed_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="@dimen/default_desc_text_size"
tools:text="Passed: July 28"/>
</LinearLayout> </LinearLayout>
<View </LinearLayout>
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dashboard_divider"/>
<LinearLayout <View
android:id="@+id/make_active_row" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="@dimen/bottom_sheet_list_item_height" android:background="?attr/dashboard_divider"/>
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height"
android:layout_marginTop="@dimen/bottom_sheet_content_margin_small"
android:paddingEnd="@dimen/bottom_sheet_content_padding"
android:paddingLeft="@dimen/bottom_sheet_content_padding"
android:paddingRight="@dimen/bottom_sheet_content_padding"
android:paddingStart="@dimen/bottom_sheet_content_padding">
<ImageView <LinearLayout
android:id="@+id/make_active_icon" android:id="@+id/make_active_row"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/bottom_sheet_list_item_height"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin" android:layout_marginTop="@dimen/bottom_sheet_content_margin_small"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin" android:background="?attr/selectableItemBackground"
tools:src="@drawable/ic_action_reset_to_default_dark"/> android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingEnd="@dimen/bottom_sheet_content_padding"
android:paddingLeft="@dimen/bottom_sheet_content_padding"
android:paddingRight="@dimen/bottom_sheet_content_padding"
android:paddingStart="@dimen/bottom_sheet_content_padding">
<TextView <ImageView
android:layout_width="wrap_content" android:id="@+id/make_active_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:maxLines="1" android:layout_height="wrap_content"
android:text="@string/make_active" android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:textAppearance="@style/TextAppearance.ListItemTitle"/> android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
</LinearLayout> tools:src="@drawable/ic_action_reset_to_default_dark"/>
<LinearLayout <TextView
android:id="@+id/delete_row" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="@dimen/bottom_sheet_list_item_height" android:maxLines="1"
android:background="?attr/selectableItemBackground" android:text="@string/make_active"
android:gravity="center_vertical" android:textAppearance="@style/TextAppearance.ListItemTitle"/>
android:minHeight="@dimen/bottom_sheet_list_item_height" </LinearLayout>
android:paddingEnd="@dimen/bottom_sheet_content_padding"
android:paddingLeft="@dimen/bottom_sheet_content_padding"
android:paddingRight="@dimen/bottom_sheet_content_padding"
android:paddingStart="@dimen/bottom_sheet_content_padding">
<ImageView <LinearLayout
android:id="@+id/delete_icon" android:id="@+id/delete_row"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/bottom_sheet_list_item_height"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin" android:background="?attr/selectableItemBackground"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin" android:gravity="center_vertical"
tools:src="@drawable/ic_action_delete_dark"/> android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingEnd="@dimen/bottom_sheet_content_padding"
android:paddingLeft="@dimen/bottom_sheet_content_padding"
android:paddingRight="@dimen/bottom_sheet_content_padding"
android:paddingStart="@dimen/bottom_sheet_content_padding">
<TextView <ImageView
android:layout_width="wrap_content" android:id="@+id/delete_icon"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:maxLines="1" android:layout_height="wrap_content"
android:text="@string/shared_string_delete" android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:textAppearance="@style/TextAppearance.ListItemTitle"/> android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
</LinearLayout> tools:src="@drawable/ic_action_delete_dark"/>
</LinearLayout> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:text="@string/shared_string_delete"
android:textAppearance="@style/TextAppearance.ListItemTitle"/>
</LinearLayout>
</ScrollView> </LinearLayout>
<View </ScrollView>
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dashboard_divider"/>
<FrameLayout <View
android:id="@+id/cancel_row" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="1dp"
android:layout_height="@dimen/bottom_sheet_cancel_button_height" android:background="?attr/dashboard_divider"/>
android:background="?attr/selectableItemBackground">
<TextView <FrameLayout
android:id="@+id/cancel_row_text" android:id="@+id/cancel_row"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/bottom_sheet_cancel_button_height"
android:layout_gravity="center" android:background="?attr/selectableItemBackground">
android:text="@string/shared_string_close"
android:textAllCaps="true" <TextView
android:textColor="?attr/color_dialog_buttons" android:id="@+id/cancel_row_text"
android:textSize="@dimen/default_desc_text_size" android:layout_width="wrap_content"
android:textStyle="bold"/> android:layout_height="wrap_content"
</FrameLayout> android:layout_gravity="center"
android:text="@string/shared_string_close"
android:textAllCaps="true"
android:textColor="?attr/color_dialog_buttons"
android:textSize="@dimen/default_desc_text_size"
android:textStyle="bold"/>
</FrameLayout>
</LinearLayout> </LinearLayout>