From 5dcd1266f7e8b0d2ea9891504b8cda83556862a5 Mon Sep 17 00:00:00 2001 From: Dzmitry Yarmolenka Date: Mon, 26 Jul 2021 15:38:07 +0200 Subject: [PATCH] [android] fixed some RTL mistakes. Removed some old not needed anymore pre-RTL xml tags in layouts. Signed-off-by: Dzmitry Yarmolenka --- .../res/layout-land/altitude_chart_panel.xml | 2 - .../layout-land/dialog_stacked_buttons.xml | 4 +- .../res/layout-land/fragment_direction.xml | 8 +-- android/res/layout-land/layout_nav_search.xml | 3 -- android/res/layout-land/onmap_downloader.xml | 2 - .../altitude_chart_panel.xml | 2 - .../layout-w1020dp-land/routing_details.xml | 2 - android/res/layout/about.xml | 4 +- android/res/layout/altitude_chart_panel.xml | 2 - android/res/layout/card_loading.xml | 50 ------------------- .../choose_bookmark_category_fragment.xml | 7 +-- android/res/layout/dialog_missed_map.xml | 4 +- android/res/layout/dialog_missed_maps.xml | 4 +- android/res/layout/dialog_sorting_types.xml | 2 +- android/res/layout/dialog_stacked_buttons.xml | 4 +- .../layout/dialog_suggest_reroute_title.xml | 4 +- android/res/layout/downloader_item.xml | 12 ++--- android/res/layout/downloader_item_header.xml | 4 +- android/res/layout/edit_bookmark_common.xml | 21 ++++---- android/res/layout/elevation_profile.xml | 4 -- android/res/layout/fragment_auth_editor.xml | 2 - .../layout/fragment_bookmark_categories.xml | 1 - ...fragment_bookmark_category_restriction.xml | 4 -- .../fragment_bookmark_category_settings.xml | 5 -- android/res/layout/fragment_bookmark_list.xml | 10 ++-- android/res/layout/fragment_confirmation.xml | 1 - android/res/layout/fragment_direction.xml | 4 +- android/res/layout/fragment_downloader.xml | 6 +-- .../res/layout/fragment_driving_options.xml | 10 ---- android/res/layout/fragment_edit_bookmark.xml | 2 +- .../res/layout/fragment_edit_description.xml | 6 +-- android/res/layout/fragment_editor.xml | 3 -- android/res/layout/fragment_editor_host.xml | 2 - android/res/layout/fragment_report.xml | 8 +-- android/res/layout/fragment_review.xml | 13 ----- android/res/layout/fragment_routing.xml | 2 - android/res/layout/fragment_search.xml | 4 +- android/res/layout/fragment_search_base.xml | 4 +- .../fragment_suggest_country_download.xml | 8 +-- .../res/layout/fragment_timetable_simple.xml | 4 +- .../res/layout/fragment_toggle_map_layer.xml | 14 ++---- .../layout/indeterminated_progress_dialog.xml | 3 +- android/res/layout/item_add_street.xml | 1 - android/res/layout/item_bookmark.xml | 5 -- android/res/layout/item_bookmark_category.xml | 4 +- .../layout/item_bookmark_category_choose.xml | 4 +- .../layout/item_bookmark_category_create.xml | 2 - .../res/layout/item_bookmark_create_group.xml | 3 -- android/res/layout/item_bookmark_import.xml | 3 -- android/res/layout/item_comment.xml | 17 +------ android/res/layout/item_cuisine.xml | 3 +- android/res/layout/item_feature_category.xml | 4 +- android/res/layout/item_missed_map.xml | 14 +++--- android/res/layout/item_missed_map_group.xml | 14 +++--- android/res/layout/item_nearby.xml | 6 --- android/res/layout/item_opening_hours.xml | 6 --- android/res/layout/item_phone.xml | 2 +- android/res/layout/item_rating.xml | 29 ----------- android/res/layout/item_search_category.xml | 6 +-- android/res/layout/item_search_result.xml | 17 +------ android/res/layout/item_street.xml | 6 +-- .../layout/item_timetable_closed_hours.xml | 5 -- android/res/layout/item_track.xml | 4 +- android/res/layout/layout_nav_search.xml | 10 ---- android/res/layout/layout_nav_top.xml | 4 +- android/res/layout/localized_name.xml | 4 +- android/res/layout/menu_route_plan_line.xml | 3 -- .../layout/place_page_bookmark_details.xml | 4 -- android/res/layout/place_page_cuisine.xml | 1 - .../layout/place_page_description_layout.xml | 4 -- .../res/layout/place_page_opening_hours.xml | 3 -- android/res/layout/place_page_placename.xml | 2 - android/res/layout/place_page_preview.xml | 28 ----------- .../res/layout/place_page_rating_records.xml | 9 +--- android/res/layout/routing_action_panel.xml | 5 +- .../layout/routing_bottom_panel_transit.xml | 10 +--- android/res/layout/routing_details.xml | 3 -- android/res/layout/routing_plan.xml | 14 ------ .../res/layout/routing_transit_step_view.xml | 4 +- android/res/layout/search_filter_panel.xml | 8 +-- android/res/layout/tab_timepicker.xml | 2 +- android/res/layout/tag_item.xml | 21 -------- android/res/layout/toolbar_with_search.xml | 1 - .../toolbar_with_search_no_elevation.xml | 1 - android/res/values/styles-editor.xml | 5 +- android/res/values/styles-menu.xml | 6 +-- android/res/values/styles-place_page.xml | 12 ++--- android/res/values/styles-text.xml | 4 +- android/res/values/styles.xml | 34 ++++++------- 89 files changed, 136 insertions(+), 482 deletions(-) delete mode 100644 android/res/layout/card_loading.xml delete mode 100644 android/res/layout/fragment_review.xml delete mode 100644 android/res/layout/item_rating.xml delete mode 100644 android/res/layout/tag_item.xml diff --git a/android/res/layout-land/altitude_chart_panel.xml b/android/res/layout-land/altitude_chart_panel.xml index 34a2c9d2a9..2a07881329 100644 --- a/android/res/layout-land/altitude_chart_panel.xml +++ b/android/res/layout-land/altitude_chart_panel.xml @@ -8,9 +8,7 @@ android:layout_weight="1" android:layout_marginBottom="@dimen/altitude_chart_margin_bottom" android:layout_marginTop="@dimen/altitude_chart_margin_top" - android:paddingLeft="@dimen/altitude_chart_container_padding_left" android:paddingStart="@dimen/altitude_chart_container_padding_left" - android:paddingRight="@dimen/altitude_chart_container_padding_left" android:paddingEnd="@dimen/altitude_chart_container_padding_left" android:paddingBottom="@dimen/altitude_chart_container_padding_bottom" android:orientation="horizontal" diff --git a/android/res/layout-land/dialog_stacked_buttons.xml b/android/res/layout-land/dialog_stacked_buttons.xml index 43b7aa7b1a..2f4467e35a 100644 --- a/android/res/layout-land/dialog_stacked_buttons.xml +++ b/android/res/layout-land/dialog_stacked_buttons.xml @@ -13,8 +13,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="@dimen/margin_base_plus" - android:paddingLeft="@dimen/margin_base_plus" - android:paddingRight="@dimen/margin_base_plus"> + android:paddingStart="@dimen/margin_base_plus" + android:paddingEnd="@dimen/margin_base_plus"> @@ -63,7 +62,6 @@ android:layout_width="@dimen/margin_quadruple" android:layout_height="@dimen/margin_quadruple" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_marginBottom="@dimen/margin_base_plus" android:background="?nav_background" @@ -76,7 +74,6 @@ android:layout_width="@dimen/margin_quadruple" android:layout_height="@dimen/margin_quadruple" android:layout_above="@id/btn_search" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:background="?nav_background" android:src="@drawable/ic_menu_bookmarks" diff --git a/android/res/layout-land/onmap_downloader.xml b/android/res/layout-land/onmap_downloader.xml index 4f609d8503..c443bc13e5 100644 --- a/android/res/layout-land/onmap_downloader.xml +++ b/android/res/layout-land/onmap_downloader.xml @@ -88,8 +88,6 @@ android:visibility="gone" android:layout_marginStart="@dimen/margin_half_plus_eight" android:layout_marginEnd="@dimen/margin_half_plus_eight" - android:layout_marginRight="@dimen/margin_half_plus_eight" - android:layout_marginLeft="@dimen/margin_half_plus_eight" android:layout_height="match_parent" android:layout_width="@dimen/divider_height"/> diff --git a/android/res/layout-w1020dp-land/routing_details.xml b/android/res/layout-w1020dp-land/routing_details.xml index 977d4c9cce..d35ce17136 100644 --- a/android/res/layout-w1020dp-land/routing_details.xml +++ b/android/res/layout-w1020dp-land/routing_details.xml @@ -18,7 +18,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/time" - android:layout_alignLeft="@id/time" android:layout_alignStart="@id/time" android:layout_marginBottom="10dp" tools:text="Arrival 13:03" @@ -28,7 +27,6 @@ android:id="@+id/altitude_difference" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:textAppearance="@style/MwmTextAppearance.Body3" android:fontFamily="@string/robotoMedium" diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml index d1943e3445..7386154b52 100644 --- a/android/res/layout/about.xml +++ b/android/res/layout/about.xml @@ -38,8 +38,8 @@ android:gravity="center_horizontal" android:layout_marginTop="@dimen/margin_base_plus" android:layout_marginBottom="@dimen/margin_base_plus" - android:layout_marginLeft="@dimen/margin_base" - android:layout_marginRight="@dimen/margin_base" + android:layout_marginStart="@dimen/margin_base" + android:layout_marginEnd="@dimen/margin_base" android:textAppearance="@style/MwmTextAppearance.Body2" android:text="@string/about_description"/> diff --git a/android/res/layout/altitude_chart_panel.xml b/android/res/layout/altitude_chart_panel.xml index 22463c4bb7..cce82751ac 100644 --- a/android/res/layout/altitude_chart_panel.xml +++ b/android/res/layout/altitude_chart_panel.xml @@ -8,9 +8,7 @@ android:layout_weight="1" android:layout_marginBottom="@dimen/altitude_chart_margin_bottom" android:layout_marginTop="@dimen/altitude_chart_margin_top" - android:paddingLeft="@dimen/altitude_chart_container_padding_left" android:paddingStart="@dimen/altitude_chart_container_padding_left" - android:paddingRight="@dimen/altitude_chart_container_padding_left" android:paddingEnd="@dimen/altitude_chart_container_padding_left" android:orientation="vertical" tools:showIn="@layout/fragment_routing"> diff --git a/android/res/layout/card_loading.xml b/android/res/layout/card_loading.xml deleted file mode 100644 index f4d9756292..0000000000 --- a/android/res/layout/card_loading.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - diff --git a/android/res/layout/choose_bookmark_category_fragment.xml b/android/res/layout/choose_bookmark_category_fragment.xml index 4326621f6e..29ad9f07a8 100644 --- a/android/res/layout/choose_bookmark_category_fragment.xml +++ b/android/res/layout/choose_bookmark_category_fragment.xml @@ -18,12 +18,9 @@ android:textStyle="normal" android:lineSpacingExtra="@dimen/text_size_banner" android:text="@string/select_list" - tools:text="Select list" - tools:targetApi="jelly_bean" android:layout_marginEnd="@dimen/margin_base_plus" - android:layout_marginRight="@dimen/margin_base_plus" - android:layout_marginLeft="@dimen/margin_base_plus" - android:layout_marginStart="@dimen/margin_base_plus"/> + android:layout_marginStart="@dimen/margin_base_plus" + tools:text="Select list"/> diff --git a/android/res/layout/dialog_missed_maps.xml b/android/res/layout/dialog_missed_maps.xml index e644e3c833..af64dcf56a 100644 --- a/android/res/layout/dialog_missed_maps.xml +++ b/android/res/layout/dialog_missed_maps.xml @@ -11,8 +11,8 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_base" android:layout_marginBottom="@dimen/margin_base" - android:paddingLeft="@dimen/margin_base_plus" - android:paddingRight="@dimen/margin_base_plus" + android:paddingStart="@dimen/margin_base_plus" + android:paddingEnd="@dimen/margin_base_plus" android:textAppearance="@style/MwmTextAppearance.Body2" android:visibility="gone" tools:visibility="visible"/> diff --git a/android/res/layout/dialog_sorting_types.xml b/android/res/layout/dialog_sorting_types.xml index 6ac4e985cc..c8ea69836c 100644 --- a/android/res/layout/dialog_sorting_types.xml +++ b/android/res/layout/dialog_sorting_types.xml @@ -13,7 +13,7 @@ diff --git a/android/res/layout/dialog_stacked_buttons.xml b/android/res/layout/dialog_stacked_buttons.xml index 57e4578fc2..409f88f1cd 100644 --- a/android/res/layout/dialog_stacked_buttons.xml +++ b/android/res/layout/dialog_stacked_buttons.xml @@ -13,8 +13,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="@dimen/margin_base_plus" - android:paddingLeft="@dimen/margin_base_plus" - android:paddingRight="@dimen/margin_base_plus"> + android:paddingStart="@dimen/margin_base_plus" + android:paddingEnd="@dimen/margin_base_plus"> diff --git a/android/res/layout/downloader_item.xml b/android/res/layout/downloader_item.xml index 60ce16109a..259068e549 100644 --- a/android/res/layout/downloader_item.xml +++ b/android/res/layout/downloader_item.xml @@ -5,8 +5,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="@dimen/height_item_multiline" - android:paddingLeft="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" + android:paddingStart="@dimen/margin_base" + android:paddingEnd="@dimen/margin_base" android:background="?clickableBackground" tools:background="#200000FF"> @@ -15,14 +15,14 @@ layout="@layout/downloader_status" android:layout_width="@dimen/downloader_status_size" android:layout_height="@dimen/downloader_status_size" - android:layout_marginRight="@dimen/margin_base" + android:layout_marginEnd="@dimen/margin_base" android:layout_centerVertical="true"/> + android:layout_toEndOf="@id/downloader_status_frame" + android:layout_toStartOf="@id/size"> + android:textAppearance="@style/MwmTextAppearance.Body1" + app:drawableEndCompat="@drawable/ic_arrow_down" /> diff --git a/android/res/layout/fragment_auth_editor.xml b/android/res/layout/fragment_auth_editor.xml index 4c9551e8b9..00da26fdd8 100644 --- a/android/res/layout/fragment_auth_editor.xml +++ b/android/res/layout/fragment_auth_editor.xml @@ -82,9 +82,7 @@ android:clipChildren="false" android:clipToPadding="false" android:orientation="vertical" - android:paddingLeft="@dimen/margin_base" android:paddingStart="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" tools:visibility="gone"> diff --git a/android/res/layout/fragment_bookmark_categories.xml b/android/res/layout/fragment_bookmark_categories.xml index 0bed9f256c..29c203ce07 100644 --- a/android/res/layout/fragment_bookmark_categories.xml +++ b/android/res/layout/fragment_bookmark_categories.xml @@ -1,7 +1,6 @@ diff --git a/android/res/layout/fragment_bookmark_category_restriction.xml b/android/res/layout/fragment_bookmark_category_restriction.xml index beebd49ff6..c73642b5b6 100644 --- a/android/res/layout/fragment_bookmark_category_restriction.xml +++ b/android/res/layout/fragment_bookmark_category_restriction.xml @@ -26,8 +26,6 @@ android:orientation="vertical" android:paddingStart="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" - android:paddingLeft="@dimen/margin_base" android:paddingBottom="@dimen/bookmark_hide_btn_padding_top" android:paddingTop="@dimen/margin_half_plus" android:background="?attr/cardBackground" @@ -60,9 +58,7 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/margin_base" android:paddingStart="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" - android:paddingLeft="@dimen/margin_base" android:paddingBottom="@dimen/margin_base" tools:ignore="UnusedAttribute"/> diff --git a/android/res/layout/fragment_bookmark_category_settings.xml b/android/res/layout/fragment_bookmark_category_settings.xml index 037c4a3d3b..394193beb0 100644 --- a/android/res/layout/fragment_bookmark_category_settings.xml +++ b/android/res/layout/fragment_bookmark_category_settings.xml @@ -24,8 +24,6 @@ android:orientation="vertical" android:paddingStart="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" - android:paddingLeft="@dimen/margin_base" android:paddingBottom="@dimen/bookmark_hide_btn_padding_top" android:paddingTop="@dimen/margin_half_plus" android:layout_width="match_parent" @@ -46,7 +44,6 @@ android:layout_width="0dp" android:background="@null" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/margin_base" android:layout_marginEnd="@dimen/margin_base"/> diff --git a/android/res/layout/fragment_bookmark_list.xml b/android/res/layout/fragment_bookmark_list.xml index 21dc09056c..ffabb861cf 100644 --- a/android/res/layout/fragment_bookmark_list.xml +++ b/android/res/layout/fragment_bookmark_list.xml @@ -27,20 +27,20 @@ android:layout_marginBottom="@dimen/margin_base" android:src="?fabViewOnMap" mapsme:layout_constraintBottom_toBottomOf="parent" - mapsme:layout_constraintRight_toRightOf="parent" + mapsme:layout_constraintEnd_toEndOf="parent" tools:ignore="NotSibling" /> diff --git a/android/res/layout/fragment_confirmation.xml b/android/res/layout/fragment_confirmation.xml index af1be31791..4235e5e722 100644 --- a/android/res/layout/fragment_confirmation.xml +++ b/android/res/layout/fragment_confirmation.xml @@ -27,7 +27,6 @@ android:layout_width="0dp" tools:ignore="UnusedAttribute" tools:text="Woohoo!" - android:layout_marginRight="@dimen/margin_base" android:layout_marginEnd="@dimen/margin_base"/> @@ -42,8 +40,8 @@ android:layout_height="match_parent" android:layout_below="@id/toolbar" android:layout_above="@id/action" - android:paddingLeft="@dimen/margin_double_and_half" - android:paddingRight="@dimen/margin_double_and_half" + android:paddingStart="@dimen/margin_double_and_half" + android:paddingEnd="@dimen/margin_double_and_half" android:paddingTop="@dimen/placeholder_margin_top" android:gravity="center_horizontal" android:visibility="gone" diff --git a/android/res/layout/fragment_driving_options.xml b/android/res/layout/fragment_driving_options.xml index 2fe864d2a0..f0f2832d2d 100644 --- a/android/res/layout/fragment_driving_options.xml +++ b/android/res/layout/fragment_driving_options.xml @@ -24,8 +24,6 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginTop="@dimen/margin_half_double_plus" - android:paddingLeft="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" android:paddingStart="@dimen/margin_base" tools:targetApi="jelly_bean"/> @@ -35,8 +33,6 @@ android:minHeight="@dimen/height_block_base" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" android:paddingStart="@dimen/margin_base"> + android:paddingStart="@dimen/margin_base" + android:paddingEnd="@dimen/margin_base"> @@ -228,7 +226,6 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/editor_margin_left" - android:layout_toLeftOf="@+id/sw__wifi" android:layout_toStartOf="@+id/sw__wifi" android:text="@string/wifi"/> @@ -30,7 +29,6 @@ android:layout_width="?actionBarSize" android:layout_height="?actionBarSize" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_gravity="end|center_vertical" android:background="?selectableItemBackgroundBorderless" android:scaleType="centerInside" diff --git a/android/res/layout/fragment_report.xml b/android/res/layout/fragment_report.xml index 3947942b99..c81ac6ce23 100644 --- a/android/res/layout/fragment_report.xml +++ b/android/res/layout/fragment_report.xml @@ -79,16 +79,16 @@ diff --git a/android/res/layout/fragment_review.xml b/android/res/layout/fragment_review.xml deleted file mode 100644 index cd16511aaf..0000000000 --- a/android/res/layout/fragment_review.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/android/res/layout/fragment_routing.xml b/android/res/layout/fragment_routing.xml index b81e1f88d5..29768083b0 100644 --- a/android/res/layout/fragment_routing.xml +++ b/android/res/layout/fragment_routing.xml @@ -25,9 +25,7 @@ diff --git a/android/res/layout/fragment_search_base.xml b/android/res/layout/fragment_search_base.xml index b3e9617942..96afbe2870 100644 --- a/android/res/layout/fragment_search_base.xml +++ b/android/res/layout/fragment_search_base.xml @@ -11,8 +11,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_horizontal" - android:paddingLeft="@dimen/margin_double_and_half" - android:paddingRight="@dimen/margin_double_and_half" + android:paddingStart="@dimen/margin_double_and_half" + android:paddingEnd="@dimen/margin_double_and_half" android:paddingTop="@dimen/placeholder_margin_top" android:visibility="gone" tools:visibility="visible"/> diff --git a/android/res/layout/fragment_suggest_country_download.xml b/android/res/layout/fragment_suggest_country_download.xml index c71509a81b..a41c971bc1 100644 --- a/android/res/layout/fragment_suggest_country_download.xml +++ b/android/res/layout/fragment_suggest_country_download.xml @@ -19,8 +19,8 @@ android:gravity="center_horizontal" android:orientation="vertical" android:layout_marginTop="@dimen/margin_double" - android:paddingLeft="@dimen/margin_double_and_half" - android:paddingRight="@dimen/margin_double_and_half"> + android:paddingStart="@dimen/margin_double_and_half" + android:paddingEnd="@dimen/margin_double_and_half"> diff --git a/android/res/layout/fragment_toggle_map_layer.xml b/android/res/layout/fragment_toggle_map_layer.xml index c25cd75ce4..33ed01de59 100644 --- a/android/res/layout/fragment_toggle_map_layer.xml +++ b/android/res/layout/fragment_toggle_map_layer.xml @@ -15,26 +15,22 @@ android:minHeight="@dimen/menu_list_item_height" android:src="@drawable/ic_drop_down" android:tint="@color/icon_tint" - android:paddingLeft="@dimen/margin_base" android:paddingStart="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" + android:background="?attr/selectableItemBackgroundBorderless" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintRight_toRightOf="parent" - android:background="?attr/selectableItemBackgroundBorderless"/> + app:layout_constraintEnd_toEndOf="parent"/> @@ -43,9 +39,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:minHeight="@dimen/toggle_map_layer_frame_height" - android:paddingLeft="@dimen/margin_base" android:paddingStart="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" app:layout_constraintTop_toBottomOf="@id/layers_text"> diff --git a/android/res/layout/indeterminated_progress_dialog.xml b/android/res/layout/indeterminated_progress_dialog.xml index f07ab518a6..33d93df441 100644 --- a/android/res/layout/indeterminated_progress_dialog.xml +++ b/android/res/layout/indeterminated_progress_dialog.xml @@ -15,8 +15,7 @@ style="?android:attr/progressBarStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="16dip" - android:layout_marginRight="16dip"/> + android:layout_marginEnd="16dip"/> diff --git a/android/res/layout/item_bookmark.xml b/android/res/layout/item_bookmark.xml index 40f43ea829..cd37f5d7dc 100644 --- a/android/res/layout/item_bookmark.xml +++ b/android/res/layout/item_bookmark.xml @@ -5,17 +5,14 @@ android:layout_height="wrap_content" android:minHeight="@dimen/height_item_multiline" android:background="?clickableBackground" - android:paddingLeft="@dimen/margin_base" android:paddingStart="@dimen/margin_base"> + android:paddingStart="@dimen/margin_half_plus" + android:paddingEnd="@dimen/margin_half_plus"> diff --git a/android/res/layout/item_bookmark_create_group.xml b/android/res/layout/item_bookmark_create_group.xml index fa5a61e9c1..be4b2dac53 100644 --- a/android/res/layout/item_bookmark_create_group.xml +++ b/android/res/layout/item_bookmark_create_group.xml @@ -7,9 +7,7 @@ android:layout_height="wrap_content" android:background="?selectableItemBackground" android:paddingStart="@dimen/margin_base" - android:paddingLeft="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" android:paddingBottom="@dimen/margin_half_plus" android:paddingTop="@dimen/margin_half_plus"> @@ -80,9 +72,7 @@ android:id="@+id/tv__positive_review" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/margin_double" android:layout_marginStart="@dimen/margin_double" - android:layout_marginRight="@dimen/margin_base" android:layout_marginEnd="@dimen/margin_base" android:layout_marginBottom="@dimen/margin_base" android:paddingTop="@dimen/margin_eighth" @@ -101,7 +91,6 @@ android:layout_width="@dimen/margin_base_plus" android:layout_height="@dimen/margin_base_plus" android:layout_marginBottom="@dimen/margin_base" - android:layout_marginLeft="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base" android:src="?ppNegative"/> @@ -109,9 +98,7 @@ android:id="@+id/tv__negative_review" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/margin_double" android:layout_marginStart="@dimen/margin_double" - android:layout_marginRight="@dimen/margin_base" android:layout_marginEnd="@dimen/margin_base" android:layout_marginBottom="@dimen/margin_base" android:paddingTop="@dimen/margin_eighth" diff --git a/android/res/layout/item_cuisine.xml b/android/res/layout/item_cuisine.xml index 5a7e26f30d..cd04669480 100644 --- a/android/res/layout/item_cuisine.xml +++ b/android/res/layout/item_cuisine.xml @@ -12,8 +12,7 @@ android:id="@+id/selected" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/margin_double" - android:layout_marginRight="@dimen/margin_double"/> + android:layout_marginEnd="@dimen/margin_double"/> diff --git a/android/res/layout/item_missed_map.xml b/android/res/layout/item_missed_map.xml index ed2dc84afd..19077afec0 100644 --- a/android/res/layout/item_missed_map.xml +++ b/android/res/layout/item_missed_map.xml @@ -8,14 +8,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="@dimen/height_item_oneline" - android:paddingLeft="@dimen/margin_base_plus" - android:paddingRight="@dimen/margin_base_plus"> + android:paddingStart="@dimen/margin_base_plus" + android:paddingEnd="@dimen/margin_base_plus"> @@ -39,12 +38,11 @@ android:id="@+id/tv__title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_toRightOf="@id/wheel_progress" - android:layout_toLeftOf="@id/tv__size" + android:layout_toEndOf="@id/wheel_progress" + android:layout_toStartOf="@id/tv__size" android:layout_centerVertical="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="@dimen/margin_half" - android:layout_marginRight="@dimen/margin_half" android:maxLines="2" android:ellipsize="end" android:textAppearance="@style/MwmTextAppearance.Body1" diff --git a/android/res/layout/item_missed_map_group.xml b/android/res/layout/item_missed_map_group.xml index 5a8168bfe8..4b4834830c 100644 --- a/android/res/layout/item_missed_map_group.xml +++ b/android/res/layout/item_missed_map_group.xml @@ -8,14 +8,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="@dimen/height_item_oneline" - android:paddingLeft="@dimen/margin_base_plus" - android:paddingRight="@dimen/margin_base_plus"> + android:paddingStart="@dimen/margin_base_plus" + android:paddingEnd="@dimen/margin_base_plus"> diff --git a/android/res/layout/item_nearby.xml b/android/res/layout/item_nearby.xml index da838d14bf..604b6a9560 100644 --- a/android/res/layout/item_nearby.xml +++ b/android/res/layout/item_nearby.xml @@ -5,9 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:paddingTop="@dimen/margin_half_plus" android:paddingBottom="@dimen/margin_half_plus" - android:paddingRight="@dimen/margin_base" android:paddingEnd="@dimen/margin_base" - android:paddingLeft="@dimen/margin_base" android:paddingStart="@dimen/margin_base" android:clickable="true" android:focusable="true" @@ -26,10 +24,8 @@ android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/margin_double" android:layout_marginStart="@dimen/margin_double" android:layout_centerVertical="true" - android:layout_toRightOf="@id/iv__icon" android:layout_toEndOf="@id/iv__icon" android:gravity="center_vertical"> @@ -54,10 +50,8 @@ android:id="@+id/tv__distance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_toRightOf="@id/ll__info" android:layout_toEndOf="@id/ll__info" android:maxLines="1" android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent" diff --git a/android/res/layout/item_opening_hours.xml b/android/res/layout/item_opening_hours.xml index 90d6f3e29a..5c67a5415f 100644 --- a/android/res/layout/item_opening_hours.xml +++ b/android/res/layout/item_opening_hours.xml @@ -7,8 +7,6 @@ android:background="?clickableBackground" android:minHeight="@dimen/editor_height_field" android:paddingEnd="@dimen/margin_quarter" - android:paddingLeft="@dimen/margin_half_plus" - android:paddingRight="@dimen/margin_quarter" android:paddingStart="@dimen/margin_half_plus" android:tag="schedule" tools:ignore="RtlSymmetry"> @@ -17,7 +15,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/margin_base_plus" - android:layout_marginRight="@dimen/margin_base_plus" android:layout_marginTop="@dimen/margin_base" android:src="@drawable/ic_operating_hours" android:tint="?iconTint"/> @@ -27,7 +24,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="@dimen/editor_margin_timetable_left" android:layout_marginStart="@dimen/editor_margin_timetable_left" android:orientation="vertical" tools:visibility="gone"> @@ -53,7 +49,6 @@ android:id="@+id/opening_hours" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/editor_margin_timetable_left" android:layout_marginStart="@dimen/editor_margin_timetable_left" android:layout_marginTop="14dp" android:background="?clickableBackground" @@ -65,7 +60,6 @@ android:id="@+id/edit_opening_hours" style="@style/MwmWidget.Editor.FieldLayout" android:layout_below="@id/opening_hours" - android:layout_marginLeft="@dimen/editor_margin_timetable_left" android:layout_marginStart="@dimen/editor_margin_timetable_left" android:layout_marginTop="@dimen/margin_base_plus" android:background="?clickableBackground" diff --git a/android/res/layout/item_phone.xml b/android/res/layout/item_phone.xml index a63ed93b8f..e2ad580040 100644 --- a/android/res/layout/item_phone.xml +++ b/android/res/layout/item_phone.xml @@ -14,7 +14,7 @@ style="@style/MwmWidget.Editor.MetadataIcon" tools:ignore="ContentDescription" tools:src="@drawable/ic_phone" - android:layout_alignParentLeft="true"/> + android:layout_alignParentStart="true"/> - - - - - - diff --git a/android/res/layout/item_search_category.xml b/android/res/layout/item_search_category.xml index df068b7865..a0626f61b9 100644 --- a/android/res/layout/item_search_category.xml +++ b/android/res/layout/item_search_category.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" style="@style/MwmWidget.TextView.Search" android:drawablePadding="@dimen/margin_base" - android:paddingLeft="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" - tools:drawableLeft="@drawable/ic_food_light" + android:paddingStart="@dimen/margin_base" + android:paddingEnd="@dimen/margin_base" + tools:drawableStart="@drawable/ic_category_eat" tools:text="Sample category"/> diff --git a/android/res/layout/item_search_result.xml b/android/res/layout/item_search_result.xml index 57fdb800d9..005fa3743b 100644 --- a/android/res/layout/item_search_result.xml +++ b/android/res/layout/item_search_result.xml @@ -2,7 +2,6 @@ @@ -20,8 +18,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="bottom" - android:paddingLeft="@dimen/margin_half" - android:paddingRight="@dimen/margin_half" + android:paddingStart="@dimen/margin_half" + android:paddingEnd="@dimen/margin_half" android:paddingTop="@dimen/margin_eighth" android:paddingBottom="@dimen/margin_eighth" android:textAppearance="@style/MwmTextAppearance.Body4.Light" @@ -32,9 +30,7 @@ android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:layout_toLeftOf="@id/metadata_container" android:layout_toStartOf="@id/metadata_container" android:textAppearance="@style/MwmTextAppearance.Body1" android:ellipsize="end" @@ -45,12 +41,9 @@ android:id="@+id/description" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_below="@id/title" - android:layout_toLeftOf="@+id/cost" android:layout_toStartOf="@id/cost" - android:layout_marginRight="@dimen/margin_half" android:layout_marginEnd="@dimen/margin_half" android:layout_marginTop="@dimen/margin_quarter" android:textAppearance="@style/MwmTextAppearance.Body3" @@ -63,7 +56,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:layout_alignTop="@id/description" android:visibility="invisible" @@ -80,7 +72,6 @@ android:id="@+id/sale" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/margin_quarter" android:layout_marginStart="@dimen/margin_quarter" android:src="?saleIcon"/> @@ -89,13 +80,10 @@ android:id="@+id/region" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_below="@id/description" - android:layout_toLeftOf="@+id/distance" android:layout_toStartOf="@id/distance" android:layout_marginTop="@dimen/margin_quarter" - android:layout_marginRight="@dimen/margin_half" android:layout_marginEnd="@dimen/margin_half" android:textAppearance="@style/MwmTextAppearance.Body3" android:maxLines="2" @@ -107,7 +95,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_alignBaseline="@id/region" android:layout_below="@id/metadata_container" android:textAppearance="@style/MwmTextAppearance.Body3" diff --git a/android/res/layout/item_street.xml b/android/res/layout/item_street.xml index 8f53dd35ed..445ebd705d 100644 --- a/android/res/layout/item_street.xml +++ b/android/res/layout/item_street.xml @@ -8,8 +8,6 @@ android:gravity="center_vertical" android:orientation="horizontal" android:paddingEnd="@dimen/margin_base" - android:paddingLeft="@dimen/margin_half_plus" - android:paddingRight="@dimen/margin_base" android:paddingStart="@dimen/margin_half_plus"> + android:layout_marginEnd="@dimen/margin_base"/> diff --git a/android/res/layout/item_timetable_closed_hours.xml b/android/res/layout/item_timetable_closed_hours.xml index 5be3c82118..3cc33d01fb 100644 --- a/android/res/layout/item_timetable_closed_hours.xml +++ b/android/res/layout/item_timetable_closed_hours.xml @@ -11,7 +11,6 @@ android:layout_width="@dimen/height_block_base" android:layout_height="@dimen/height_block_base" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_centerVertical="true" android:background="?selectableItemBackgroundBorderless" android:scaleType="center" @@ -21,9 +20,7 @@ android:id="@+id/tv__closed_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base" - android:layout_toLeftOf="@id/iv__remove_closed" android:layout_toStartOf="@id/iv__remove_closed" android:text="@string/editor_hours_closed" android:textAppearance="@style/MwmTextAppearance.Body3"/> @@ -32,11 +29,9 @@ android:id="@+id/tv__closed" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignLeft="@id/tv__closed_title" android:layout_alignStart="@id/tv__closed_title" android:layout_below="@id/tv__closed_title" android:layout_marginTop="@dimen/margin_eighth" - android:layout_toLeftOf="@id/iv__remove_closed" android:layout_toStartOf="@id/iv__remove_closed" android:textAppearance="@style/MwmTextAppearance.Body1" tools:text="15:00--16:00"/> diff --git a/android/res/layout/item_track.xml b/android/res/layout/item_track.xml index 8a6c23b18f..d4063f165c 100644 --- a/android/res/layout/item_track.xml +++ b/android/res/layout/item_track.xml @@ -11,8 +11,8 @@ android:layout_height="wrap_content" android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:layout_marginLeft="@dimen/margin_base" - android:layout_marginRight="@dimen/margin_base" /> + android:layout_marginStart="@dimen/margin_base" + android:layout_marginEnd="@dimen/margin_base" /> @@ -82,7 +75,6 @@ android:layout_alignParentBottom="true" android:layout_marginBottom="@dimen/margin_double" android:layout_toEndOf="@id/search_fuel" - android:layout_toRightOf="@id/search_fuel" android:src="@drawable/ic_routing_food_on"/> @@ -103,7 +94,6 @@ android:layout_width="@dimen/margin_quadruple" android:layout_height="@dimen/margin_quadruple" android:layout_below="@id/btn_bookmarks" - android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:background="?nav_background" android:src="@drawable/ic_menu_search" diff --git a/android/res/layout/layout_nav_top.xml b/android/res/layout/layout_nav_top.xml index ce6e48aed2..271538eaee 100644 --- a/android/res/layout/layout_nav_top.xml +++ b/android/res/layout/layout_nav_top.xml @@ -18,7 +18,6 @@ style="@style/MwmWidget.TextView.NavStreet" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="@dimen/nav_street_left" android:layout_marginStart="@dimen/nav_street_left" android:maxLines="2" android:layout_gravity="center_vertical" @@ -80,8 +79,7 @@ android:layout_height="@dimen/nav_next_next_turn_frame" android:layout_marginBottom="@dimen/margin_base" android:layout_below="@id/nav_next_turn_frame" - android:layout_alignLeft="@id/nav_next_turn_frame" - android:layout_alignRight="@id/nav_next_turn_frame" + android:layout_alignStart="@id/nav_next_turn_frame" android:layout_alignEnd="@id/nav_next_turn_frame" android:background="?navNextNextTurnFrame" android:elevation="@dimen/nav_elevation" diff --git a/android/res/layout/localized_name.xml b/android/res/layout/localized_name.xml index 124d9c151b..14c9e8dfc2 100644 --- a/android/res/layout/localized_name.xml +++ b/android/res/layout/localized_name.xml @@ -9,8 +9,6 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingEnd="@dimen/margin_base" - android:paddingLeft="@dimen/margin_base" - android:paddingRight="@dimen/margin_base" android:paddingStart="@dimen/margin_base"> diff --git a/android/res/layout/menu_route_plan_line.xml b/android/res/layout/menu_route_plan_line.xml index dcd15d06d1..ad3f5b96ef 100644 --- a/android/res/layout/menu_route_plan_line.xml +++ b/android/res/layout/menu_route_plan_line.xml @@ -15,16 +15,13 @@ diff --git a/android/res/layout/place_page_cuisine.xml b/android/res/layout/place_page_cuisine.xml index e31b262489..0a7a02a642 100644 --- a/android/res/layout/place_page_cuisine.xml +++ b/android/res/layout/place_page_cuisine.xml @@ -11,7 +11,6 @@ diff --git a/android/res/layout/place_page_description_layout.xml b/android/res/layout/place_page_description_layout.xml index 5034531385..9886338cf4 100644 --- a/android/res/layout/place_page_description_layout.xml +++ b/android/res/layout/place_page_description_layout.xml @@ -14,8 +14,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/margin_base" - android:layout_marginLeft="@dimen/margin_base" - android:layout_marginRight="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base" android:layout_marginTop="@dimen/margin_base" android:maxLength="500" @@ -33,8 +31,6 @@ android:layout_height="wrap_content" android:layout_gravity="start|bottom" android:layout_marginEnd="@dimen/margin_base" - android:layout_marginLeft="@dimen/margin_base" - android:layout_marginRight="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base" android:textAppearance="?android:attr/textAppearance" android:gravity="start|top" diff --git a/android/res/layout/place_page_opening_hours.xml b/android/res/layout/place_page_opening_hours.xml index a57bd0fb24..d4b500b2cf 100644 --- a/android/res/layout/place_page_opening_hours.xml +++ b/android/res/layout/place_page_opening_hours.xml @@ -11,7 +11,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/margin_base" - android:layout_marginRight="@dimen/margin_base" android:layout_marginTop="@dimen/margin_quarter" android:src="@drawable/ic_operating_hours" android:tint="?iconTint"/> @@ -22,7 +21,6 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_toEndOf="@id/icon" - android:layout_toRightOf="@id/icon" android:textAppearance="@style/MwmTextAppearance.PlacePage" tools:text="@string/day_off_today" tools:textColor="@color/base_red" @@ -35,7 +33,6 @@ android:layout_below="@id/today_opening_hours" android:layout_marginTop="@dimen/margin_base" android:layout_toEndOf="@id/icon" - android:layout_toRightOf="@id/icon" android:gravity="top|start" android:lineSpacingExtra="@dimen/margin_base" android:textAppearance="@style/MwmTextAppearance.Body3" diff --git a/android/res/layout/place_page_placename.xml b/android/res/layout/place_page_placename.xml index d6807d1e96..e8f7f1ed52 100644 --- a/android/res/layout/place_page_placename.xml +++ b/android/res/layout/place_page_placename.xml @@ -26,14 +26,12 @@ style="@style/PlacePageMetadataText" android:layout_above="@id/anchor_center" android:layout_toEndOf="@id/iv__place_name" - android:layout_toRightOf="@id/iv__place_name" tools:text="Sample place"/> @@ -45,12 +43,8 @@ android:layout_below="@id/pull_icon_container" android:layout_marginTop="@dimen/margin_quarter" android:layout_marginEnd="@dimen/margin_base" - android:layout_marginRight="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base" - android:layout_marginLeft="@dimen/margin_base" android:layout_toEndOf="@id/downloader_status_frame" - android:layout_toRightOf="@id/downloader_status_frame" - android:layout_toLeftOf="@id/direction_frame" android:layout_toStartOf="@id/direction_frame"> @@ -142,28 +133,11 @@ android:layout_below="@id/direction_frame" android:layout_marginTop="@dimen/margin_quarter" android:layout_marginEnd="@dimen/margin_base" - android:layout_marginRight="@dimen/margin_base" android:layout_marginStart="@dimen/margin_base" - android:layout_marginLeft="@dimen/margin_base" android:textAppearance="@style/MwmTextAppearance.Body3" tools:background="#60000000" tools:text="Lenina str, 10"/> -