From b4bedcd4488d87788c5cc5f1e04304200a86ec42 Mon Sep 17 00:00:00 2001 From: PavelRatushny Date: Thu, 19 Oct 2017 11:41:55 +0300 Subject: [PATCH] Fix tablet UI (cherry picked from commit 6a6a648) --- ...er_circle_background_dark_n_with_inset.xml | 8 +- ...r_circle_background_light_n_with_inset.xml | 8 +- ..._circle_background_on_map_n_with_inset.xml | 8 +- .../marker_circle_background_p_with_inset.xml | 8 +- .../layout-land/fragment_measurement_tool.xml | 12 +-- .../fragment_plan_route_half_screen.xml | 8 +- .../layout/close_measurement_tool_dialog.xml | 2 +- .../fragment_coordinate_input_dialog.xml | 2 +- .../layout/fragment_map_markers_dialog.xml | 6 +- ...r_coordinate_input_bottom_sheet_dialog.xml | 16 +-- ...nate_input_options_bottom_sheet_helper.xml | 16 +-- ...ent_marker_history_bottom_sheet_dialog.xml | 26 ++--- ...ent_marker_options_bottom_sheet_dialog.xml | 98 +++++++++---------- ...nt_marker_order_by_bottom_sheet_dialog.xml | 40 ++++---- ...rker_save_as_track_bottom_sheet_dialog.xml | 16 +-- ...ker_show_direction_bottom_sheet_dialog.xml | 48 ++++----- .../res/layout/fragment_measurement_tool.xml | 12 +-- .../fragment_options_bottom_sheet_dialog.xml | 66 ++++++------- ...plan_route_options_bottom_sheet_dialog.xml | 56 +++++------ ..._save_as_new_track_bottom_sheet_dialog.xml | 32 +++--- ...ment_selected_menu_bottom_sheet_dialog.xml | 48 ++++----- ...gment_snap_to_road_bottom_sheet_dialog.xml | 16 +-- .../res/layout/list_item_icon_and_title.xml | 8 +- OsmAnd/res/layout/map_marker_item_header.xml | 12 +-- OsmAnd/res/layout/map_marker_item_new.xml | 38 +++---- .../map_marker_item_show_hide_history.xml | 8 +- .../res/layout/marker_coordinate_formats.xml | 24 ++--- .../layout/markers_track_name_edit_text.xml | 8 +- .../markers_track_name_text_field_box.xml | 8 +- .../res/layout/measure_points_list_item.xml | 34 +++---- .../plan_route_toolbar_and_up_down_row.xml | 4 +- OsmAnd/res/layout/save_gpx_dialog.xml | 2 +- OsmAnd/res/values-large/sizes.xml | 15 ++- OsmAnd/res/values/sizes.xml | 13 ++- ...ryMarkerMenuBottomSheetDialogFragment.java | 2 +- .../OptionsBottomSheetDialogFragment.java | 2 +- .../OrderByBottomSheetDialogFragment.java | 2 +- ...RouteOptionsBottomSheetDialogFragment.java | 2 +- .../SaveAsTrackBottomSheetDialogFragment.java | 2 +- ...howDirectionBottomSheetDialogFragment.java | 2 +- .../OptionsBottomSheetDialogFragment.java | 2 +- ...electedPointBottomSheetDialogFragment.java | 2 +- 42 files changed, 375 insertions(+), 367 deletions(-) diff --git a/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml index ad071dcc25..d777eb52c4 100644 --- a/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml +++ b/OsmAnd/res/drawable/marker_circle_background_dark_n_with_inset.xml @@ -1,7 +1,7 @@ \ No newline at end of file + android:insetBottom="@dimen/context_menu_first_line_top_margin" + android:insetLeft="@dimen/context_menu_first_line_top_margin" + android:insetRight="@dimen/context_menu_first_line_top_margin" + android:insetTop="@dimen/context_menu_first_line_top_margin"/> \ No newline at end of file diff --git a/OsmAnd/res/drawable/marker_circle_background_light_n_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_light_n_with_inset.xml index b20f1f27f0..8c2cc54e0a 100644 --- a/OsmAnd/res/drawable/marker_circle_background_light_n_with_inset.xml +++ b/OsmAnd/res/drawable/marker_circle_background_light_n_with_inset.xml @@ -1,7 +1,7 @@ \ No newline at end of file + android:insetBottom="@dimen/context_menu_first_line_top_margin" + android:insetLeft="@dimen/context_menu_first_line_top_margin" + android:insetRight="@dimen/context_menu_first_line_top_margin" + android:insetTop="@dimen/context_menu_first_line_top_margin"/> \ No newline at end of file diff --git a/OsmAnd/res/drawable/marker_circle_background_on_map_n_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_on_map_n_with_inset.xml index e9ab9f1da0..26b6310ad7 100644 --- a/OsmAnd/res/drawable/marker_circle_background_on_map_n_with_inset.xml +++ b/OsmAnd/res/drawable/marker_circle_background_on_map_n_with_inset.xml @@ -1,7 +1,7 @@ \ No newline at end of file + android:insetBottom="@dimen/context_menu_first_line_top_margin" + android:insetLeft="@dimen/context_menu_first_line_top_margin" + android:insetRight="@dimen/context_menu_first_line_top_margin" + android:insetTop="@dimen/context_menu_first_line_top_margin"/> \ No newline at end of file diff --git a/OsmAnd/res/drawable/marker_circle_background_p_with_inset.xml b/OsmAnd/res/drawable/marker_circle_background_p_with_inset.xml index 87a731b9d6..849b4ac748 100644 --- a/OsmAnd/res/drawable/marker_circle_background_p_with_inset.xml +++ b/OsmAnd/res/drawable/marker_circle_background_p_with_inset.xml @@ -1,9 +1,9 @@ + android:insetBottom="@dimen/context_menu_first_line_top_margin" + android:insetLeft="@dimen/context_menu_first_line_top_margin" + android:insetRight="@dimen/context_menu_first_line_top_margin" + android:insetTop="@dimen/context_menu_first_line_top_margin"> \ No newline at end of file diff --git a/OsmAnd/res/layout-land/fragment_measurement_tool.xml b/OsmAnd/res/layout-land/fragment_measurement_tool.xml index 9a611c8672..3c3615d0af 100644 --- a/OsmAnd/res/layout-land/fragment_measurement_tool.xml +++ b/OsmAnd/res/layout-land/fragment_measurement_tool.xml @@ -70,9 +70,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginEnd="@dimen/measurement_tool_text_margin_small" + android:layout_marginEnd="@dimen/text_margin_small" android:layout_marginLeft="@dimen/measurement_tool_text_margin" - android:layout_marginRight="@dimen/measurement_tool_text_margin_small" + android:layout_marginRight="@dimen/text_margin_small" android:layout_marginStart="@dimen/measurement_tool_text_margin" android:layout_toEndOf="@id/main_icon" android:layout_toRightOf="@id/main_icon" @@ -108,9 +108,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginEnd="@dimen/measurement_tool_text_margin_small" + android:layout_marginEnd="@dimen/text_margin_small" android:layout_marginLeft="@dimen/measurement_tool_text_margin" - android:layout_marginRight="@dimen/measurement_tool_text_margin_small" + android:layout_marginRight="@dimen/text_margin_small" android:layout_marginStart="@dimen/measurement_tool_text_margin" android:layout_toEndOf="@id/main_icon" android:layout_toRightOf="@id/main_icon" @@ -123,9 +123,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginEnd="@dimen/measurement_tool_text_margin_small" + android:layout_marginEnd="@dimen/text_margin_small" android:layout_marginLeft="@dimen/measurement_tool_text_margin" - android:layout_marginRight="@dimen/measurement_tool_text_margin_small" + android:layout_marginRight="@dimen/text_margin_small" android:layout_marginStart="@dimen/measurement_tool_text_margin" android:layout_toEndOf="@id/main_icon" android:layout_toRightOf="@id/main_icon" diff --git a/OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml b/OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml index d85da7b8fc..fa57a31b82 100644 --- a/OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml +++ b/OsmAnd/res/layout-land/fragment_plan_route_half_screen.xml @@ -47,8 +47,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginEnd="@dimen/measurement_tool_text_margin_small" - android:layout_marginRight="@dimen/measurement_tool_text_margin_small" + android:layout_marginEnd="@dimen/text_margin_small" + android:layout_marginRight="@dimen/text_margin_small" android:ellipsize="end" android:maxLines="1" android:textAppearance="@style/TextAppearance.ListItemTitle" @@ -86,8 +86,8 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingLeft="@dimen/list_content_padding" + android:paddingRight="@dimen/list_content_padding" android:text="@string/shared_string_options" android:textAllCaps="true" android:textColor="?attr/color_dialog_buttons" diff --git a/OsmAnd/res/layout/close_measurement_tool_dialog.xml b/OsmAnd/res/layout/close_measurement_tool_dialog.xml index e1c823056a..66d2b6fa42 100644 --- a/OsmAnd/res/layout/close_measurement_tool_dialog.xml +++ b/OsmAnd/res/layout/close_measurement_tool_dialog.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:padding="@dimen/bottom_sheet_content_padding"> + android:padding="@dimen/content_padding"> @@ -34,10 +34,10 @@ diff --git a/OsmAnd/res/layout/fragment_marker_coordinate_input_options_bottom_sheet_helper.xml b/OsmAnd/res/layout/fragment_marker_coordinate_input_options_bottom_sheet_helper.xml index cd2b841a19..9a9d487f03 100644 --- a/OsmAnd/res/layout/fragment_marker_coordinate_input_options_bottom_sheet_helper.xml +++ b/OsmAnd/res/layout/fragment_marker_coordinate_input_options_bottom_sheet_helper.xml @@ -23,10 +23,10 @@ android:layout_width="match_parent" android:layout_height="@dimen/bottom_sheet_title_height" android:gravity="center_vertical" - 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" + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding" android:text="@string/shared_string_options" android:textAppearance="@style/TextAppearance.ListItemTitle" osmand:typeface="@string/font_roboto_medium"/> @@ -38,8 +38,8 @@ android:background="?attr/selectableItemBackground" android:descendantFocusability="blocksDescendants" android:minHeight="@dimen/bottom_sheet_list_item_height" - android:paddingLeft="@dimen/bottom_sheet_content_padding" - android:paddingRight="@dimen/bottom_sheet_content_padding"> + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding"> diff --git a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml index b89be37e6b..a53f553019 100644 --- a/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml +++ b/OsmAnd/res/layout/fragment_marker_history_bottom_sheet_dialog.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingBottom="8dp"> + android:paddingBottom="@dimen/bottom_sheet_content_padding_small"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingBottom="@dimen/bottom_sheet_content_padding_small"> @@ -37,15 +37,15 @@ android:layout_height="@dimen/bottom_sheet_list_item_height" android:background="?attr/selectableItemBackground" 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"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> @@ -37,10 +37,10 @@ android:layout_height="@dimen/bottom_sheet_list_item_height" android:background="?attr/selectableItemBackground" 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" + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding" android:gravity="center_vertical"> @@ -34,10 +34,10 @@ diff --git a/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml index d94792fa53..c818680b60 100644 --- a/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml +++ b/OsmAnd/res/layout/fragment_marker_show_direction_bottom_sheet_dialog.xml @@ -23,10 +23,10 @@ android:layout_width="match_parent" android:layout_height="@dimen/bottom_sheet_title_height" android:gravity="center_vertical" - 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" + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding" android:text="@string/show_direction" android:textAppearance="@style/TextAppearance.ListItemTitle" osmand:typeface="@string/font_roboto_medium"/> @@ -34,10 +34,10 @@ @@ -122,8 +122,8 @@ android:background="?attr/selectableItemBackground" android:descendantFocusability="blocksDescendants" android:minHeight="@dimen/bottom_sheet_list_item_height" - android:paddingLeft="@dimen/bottom_sheet_content_padding" - android:paddingRight="@dimen/bottom_sheet_content_padding"> + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding"> + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingBottom="@dimen/bottom_sheet_content_padding_small"> @@ -38,10 +38,10 @@ android:layout_height="@dimen/bottom_sheet_list_item_height" android:background="?attr/selectableItemBackground" 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"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> @@ -39,10 +39,10 @@ android:background="?attr/selectableItemBackground" 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" + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding" android:visibility="gone" tools:visibility="visible"> @@ -71,10 +71,10 @@ android:background="?attr/selectableItemBackground" 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"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> @@ -34,10 +34,10 @@ @@ -121,10 +121,10 @@ android:layout_height="@dimen/bottom_sheet_list_item_height" android:background="?attr/selectableItemBackground" 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"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> diff --git a/OsmAnd/res/layout/list_item_icon_and_title.xml b/OsmAnd/res/layout/list_item_icon_and_title.xml index 783198f543..ee7652a09c 100644 --- a/OsmAnd/res/layout/list_item_icon_and_title.xml +++ b/OsmAnd/res/layout/list_item_icon_and_title.xml @@ -6,10 +6,10 @@ android:layout_height="@dimen/bottom_sheet_list_item_height" android:background="?attr/selectableItemBackground" 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"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> diff --git a/OsmAnd/res/layout/map_marker_item_new.xml b/OsmAnd/res/layout/map_marker_item_new.xml index 3f1f1d6c38..2ebd8cd890 100644 --- a/OsmAnd/res/layout/map_marker_item_new.xml +++ b/OsmAnd/res/layout/map_marker_item_new.xml @@ -25,13 +25,13 @@ @@ -49,8 +49,8 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center_vertical" - android:layout_marginEnd="16dp" - android:layout_marginRight="16dp" + android:layout_marginEnd="@dimen/bottom_sheet_content_margin" + android:layout_marginRight="@dimen/bottom_sheet_content_margin" tools:src="@drawable/ic_action_flag_dark"/> + android:layout_height="@dimen/map_marker_title_height"> @@ -158,10 +158,10 @@ android:id="@+id/map_marker_check_box" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" - android:layout_marginTop="16dp" + android:layout_marginBottom="@dimen/bottom_sheet_content_margin" + android:layout_marginLeft="@dimen/bottom_sheet_content_margin" + android:layout_marginRight="@dimen/bottom_sheet_content_margin" + android:layout_marginTop="@dimen/bottom_sheet_content_margin" android:visibility="gone" tools:visibility="visible"/> @@ -172,8 +172,8 @@ android:id="@+id/divider" android:layout_width="wrap_content" android:layout_height="1dp" - android:layout_marginLeft="56dp" - android:layout_marginStart="56dp" + android:layout_marginLeft="@dimen/map_button_shadow_width" + android:layout_marginStart="@dimen/map_button_shadow_width" tools:background="?attr/dashboard_divider"/> diff --git a/OsmAnd/res/layout/map_marker_item_show_hide_history.xml b/OsmAnd/res/layout/map_marker_item_show_hide_history.xml index 908b633e61..3d066409d2 100644 --- a/OsmAnd/res/layout/map_marker_item_show_hide_history.xml +++ b/OsmAnd/res/layout/map_marker_item_show_hide_history.xml @@ -10,19 +10,19 @@ + android:layout_height="@dimen/bottom_sheet_list_item_height"> diff --git a/OsmAnd/res/layout/marker_coordinate_formats.xml b/OsmAnd/res/layout/marker_coordinate_formats.xml index 3d589075c9..f342c3d05a 100644 --- a/OsmAnd/res/layout/marker_coordinate_formats.xml +++ b/OsmAnd/res/layout/marker_coordinate_formats.xml @@ -12,10 +12,10 @@ android:background="?attr/selectableItemBackground" 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"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding"> @@ -32,8 +32,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginEnd="16dp" - android:layout_marginRight="16dp" + android:layout_marginEnd="@dimen/bottom_sheet_content_margin" + android:layout_marginRight="@dimen/bottom_sheet_content_margin" android:layout_toEndOf="@id/measure_point_reorder_icon" android:layout_toRightOf="@id/measure_point_reorder_icon" tools:src="@drawable/ic_action_measure_point"/> @@ -47,12 +47,12 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackground" android:focusableInTouchMode="true" - android:paddingBottom="12dp" - android:paddingEnd="16dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingStart="16dp" - android:paddingTop="12dp" + android:paddingBottom="@dimen/measurement_tool_content_padding_medium" + android:paddingEnd="@dimen/content_padding" + android:paddingLeft="@dimen/content_padding" + android:paddingRight="@dimen/content_padding" + android:paddingStart="@dimen/content_padding" + android:paddingTop="@dimen/measurement_tool_content_padding_medium" tools:src="@drawable/ic_action_remove_dark"/> + android:padding="@dimen/content_padding"> 14sp 27sp + 24sp + 15sp 15sp 12sp @@ -97,11 +99,11 @@ 30dp 24dp 12dp - 24dp + 24dp 12dp 12dp 18dp - 6dp + 6dp 12dp 330dp 48dp @@ -118,13 +120,16 @@ 66dp 72dp 36dp - 11dp - 12dp - 96dp + 11dp + 12dp + 84dp 15dp 84dp 78dp 15dp + + 8dp + 42dp \ No newline at end of file diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml index d43bf1466d..aacd678beb 100644 --- a/OsmAnd/res/values/sizes.xml +++ b/OsmAnd/res/values/sizes.xml @@ -162,11 +162,11 @@ 20dp 16dp 8dp - 16dp + 16dp 8dp 8dp 12dp - 4dp + 4dp 8dp 220dp 48dp @@ -183,12 +183,15 @@ 44dp 48dp 24dp - 7dp - 8dp - 64dp + 7dp + 8dp + 64dp 10dp 56dp 52dp 10dp + + 5dp + 28dp \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java index d8fe089349..c6b8d359be 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/HistoryMarkerMenuBottomSheetDialogFragment.java @@ -117,7 +117,7 @@ public class HistoryMarkerMenuBottomSheetDialogFragment extends BottomSheetDialo if (!portrait) { if (screenHeight - statusBarHeight - mainView.getHeight() - >= AndroidUtils.dpToPx(getActivity(), 8)) { + >= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) { AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark); } else { diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java index 606798e3e5..8da8580f2f 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/OptionsBottomSheetDialogFragment.java @@ -179,7 +179,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment if (!portrait) { if (screenHeight - statusBarHeight - mainView.getHeight() - >= AndroidUtils.dpToPx(getActivity(), 8)) { + >= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) { AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark); } else { diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java index 6ee9925660..c2cee573e1 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/OrderByBottomSheetDialogFragment.java @@ -98,7 +98,7 @@ public class OrderByBottomSheetDialogFragment extends BottomSheetDialogFragment if (!portrait) { if (screenHeight - statusBarHeight - mainView.getHeight() - >= AndroidUtils.dpToPx(getActivity(), 8)) { + >= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) { AndroidUtils.setBackground(getActivity(), mainView, night, R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark); } else { diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java index 4ef91ecfd6..02228c50fc 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteOptionsBottomSheetDialogFragment.java @@ -141,7 +141,7 @@ public class PlanRouteOptionsBottomSheetDialogFragment extends BottomSheetDialog } if (!portrait) { - if (screenHeight - statusBarHeight - mainView.getHeight() >= AndroidUtils.dpToPx(getActivity(), 8)) { + if (screenHeight - statusBarHeight - mainView.getHeight() >= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) { AndroidUtils.setBackground(getActivity(), mainView, night, R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark); } else { diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java index 284454f23e..a8cff6f07d 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/SaveAsTrackBottomSheetDialogFragment.java @@ -120,7 +120,7 @@ public class SaveAsTrackBottomSheetDialogFragment extends BottomSheetDialogFragm if (!portrait) { if (screenHeight - statusBarHeight - mainView.getHeight() - >= AndroidUtils.dpToPx(getActivity(), 8)) { + >= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) { AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark); } else { diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java index dacf153f6c..a9530827fc 100644 --- a/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapmarkers/ShowDirectionBottomSheetDialogFragment.java @@ -161,7 +161,7 @@ public class ShowDirectionBottomSheetDialogFragment extends BottomSheetDialogFra if (!portrait) { if (screenHeight - statusBarHeight - mainView.getHeight() - >= AndroidUtils.dpToPx(getActivity(), 8)) { + >= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) { AndroidUtils.setBackground(getActivity(), mainView, night, R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark); } else { diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java index 81bb38aac4..d8fec9de3f 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java @@ -150,7 +150,7 @@ public class OptionsBottomSheetDialogFragment extends BottomSheetDialogFragment if (!portrait) { if (screenHeight - statusBarHeight - mainView.getHeight() - >= AndroidUtils.dpToPx(getActivity(), 8)) { + >= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) { AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark); } else { diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java index b196f1410c..6588e9fd12 100644 --- a/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java +++ b/OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java @@ -176,7 +176,7 @@ public class SelectedPointBottomSheetDialogFragment extends BottomSheetDialogFra if (!portrait) { if (screenHeight - statusBarHeight - mainView.getHeight() - >= AndroidUtils.dpToPx(getActivity(), 8)) { + >= getResources().getDimension(R.dimen.bottom_sheet_content_padding_small)) { AndroidUtils.setBackground(getActivity(), mainView, nightMode, R.drawable.bg_bottom_sheet_topsides_landscape_light, R.drawable.bg_bottom_sheet_topsides_landscape_dark); } else {