From ecdeee3e766377bb4e5c2acb437b1dd9d6044880 Mon Sep 17 00:00:00 2001 From: max Date: Fri, 12 Apr 2024 09:55:20 +0800 Subject: [PATCH] =?UTF-8?q?RTL=E9=80=82=E9=85=8D=EF=BC=9A=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=9B=BF=E6=8D=A2=E5=B8=83=E5=B1=80=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=EF=BC=88layout=5FmarginLeft->layout=5FmarginStar=E3=80=81layou?= =?UTF-8?q?t=5FmarginRight->layout=5FmarginEnd=E3=80=81paddingLeft->paddin?= =?UTF-8?q?gStart=E3=80=81paddingRight->paddingEnd=E3=80=81drawableLeft->d?= =?UTF-8?q?rawableStar=E3=80=81drawableRight->drawableEnd=E3=80=81gravityL?= =?UTF-8?q?eft->gravityStart=E3=80=81gravityRight->gravityEnd=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/activity_add_team_member.xml | 14 ++-- .../activity_add_team_member_search_list.xml | 12 +-- .../main/res/layout/activity_audiorecord.xml | 4 +- .../activity_bill_gift_income_group.xml | 6 +- app/src/main/res/layout/activity_bills.xml | 12 +-- .../main/res/layout/activity_bills_gift.xml | 6 +- .../res/layout/activity_cd_key_charge.xml | 8 +- app/src/main/res/layout/activity_cp_home.xml | 4 +- app/src/main/res/layout/activity_cp_task.xml | 20 ++--- .../main/res/layout/activity_create_pk.xml | 80 +++++++++---------- .../layout/activity_create_team_message.xml | 12 +-- app/src/main/res/layout/activity_fans.xml | 4 +- app/src/main/res/layout/activity_feedback.xml | 6 +- .../layout/activity_granted_permissions.xml | 4 +- app/src/main/res/layout/activity_jewel.xml | 18 ++--- .../layout/activity_lucky_money_detail.xml | 4 +- .../main/res/layout/activity_modify_info.xml | 12 +-- app/src/main/res/layout/activity_my_voice.xml | 8 +- .../res/layout/activity_new_user_list.xml | 4 +- .../layout/activity_nim_add_black_list.xml | 6 +- .../res/layout/activity_patriarch_mode.xml | 8 +- .../res/layout/activity_recyclerview_bind.xml | 4 +- .../main/res/layout/activity_room_setting.xml | 26 +++--- app/src/main/res/layout/activity_search.xml | 4 +- .../main/res/layout/activity_search_hall.xml | 4 +- app/src/main/res/layout/activity_setting.xml | 12 +-- .../main/res/layout/activity_skill_edit.xml | 2 +- .../main/res/layout/activity_skill_home.xml | 4 +- .../res/layout/activity_team_member_list.xml | 14 ++-- .../activity_team_member_search_list.xml | 12 +-- .../activity_team_weekly_bill_search.xml | 12 +-- .../res/layout/activity_user_info_modify.xml | 28 +++---- .../res/layout/activity_withdraw_bills.xml | 12 +-- .../res/layout/default_toolbar_layout.xml | 2 +- .../main/res/layout/dialog_bottom_auction.xml | 14 ++-- .../res/layout/dialog_bottom_auction_plus.xml | 22 ++--- .../main/res/layout/dialog_bottom_face.xml | 4 +- .../res/layout/dialog_bottom_type_select.xml | 28 +++---- app/src/main/res/layout/dialog_cp_global.xml | 16 ++-- app/src/main/res/layout/dialog_cp_invite.xml | 10 +-- .../res/layout/dialog_cp_invite_reply.xml | 14 ++-- .../layout/dialog_cp_invite_reply_confirm.xml | 6 +- app/src/main/res/layout/dialog_cp_mp.xml | 24 +++--- ..._custom_voice_match_sync_history_voice.xml | 12 +-- .../main/res/layout/dialog_disband_family.xml | 4 +- .../dialog_family_currency_contribution.xml | 20 ++--- .../dialog_family_currency_transfer.xml | 14 ++-- .../main/res/layout/dialog_family_exit.xml | 4 +- .../layout/dialog_family_invite_confirm.xml | 14 ++-- .../main/res/layout/dialog_family_join.xml | 4 +- .../layout/dialog_family_remove_member.xml | 4 +- app/src/main/res/layout/dialog_filtrate.xml | 8 +- app/src/main/res/layout/dialog_game_exit.xml | 2 +- .../main/res/layout/dialog_game_select.xml | 4 +- app/src/main/res/layout/dialog_level_up.xml | 4 +- .../layout/dialog_manual_quantity_gift.xml | 6 +- .../main/res/layout/dialog_new_user_task.xml | 4 +- .../main/res/layout/dialog_pk_mic_queue.xml | 4 +- app/src/main/res/layout/dialog_pk_result.xml | 10 +-- .../res/layout/dialog_pub_room_shutup.xml | 20 ++--- .../main/res/layout/dialog_request_upmic.xml | 4 +- app/src/main/res/layout/dialog_user_info.xml | 4 +- .../main/res/layout/dialog_vip_upgrade.xml | 10 +-- .../main/res/layout/family_fans_list_item.xml | 4 +- .../res/layout/family_list_item_friend.xml | 2 +- app/src/main/res/layout/fans_list_item.xml | 4 +- .../res/layout/fragment_association_room.xml | 4 +- .../res/layout/fragment_dialog_room_title.xml | 4 +- app/src/main/res/layout/fragment_family.xml | 32 ++++---- .../main/res/layout/fragment_game_list.xml | 4 +- .../main/res/layout/fragment_gift_income.xml | 10 +-- app/src/main/res/layout/fragment_msg.xml | 4 +- .../res/layout/fragment_radish_record.xml | 10 +-- .../main/res/layout/fragment_userinfo_cp.xml | 4 +- .../res/layout/fragment_userinfo_info.xml | 4 +- .../main/res/layout/fragment_voice_card.xml | 4 +- .../res/layout/header_famiy_currency_bill.xml | 22 ++--- .../home_module_title_recycler_view.xml | 4 +- .../res/layout/item_add_skill_select_card.xml | 4 +- .../main/res/layout/item_add_team_member.xml | 4 +- .../res/layout/item_attention_in_room.xml | 4 +- app/src/main/res/layout/item_banner.xml | 4 +- .../res/layout/item_car_garage_normal.xml | 2 +- .../res/layout/item_car_garage_undrive.xml | 2 +- .../main/res/layout/item_cp_boss_micro.xml | 2 +- .../layout/item_cp_declaration_recommend.xml | 4 +- .../main/res/layout/item_cp_invite_record.xml | 12 +-- app/src/main/res/layout/item_cp_task.xml | 14 ++-- .../main/res/layout/item_erban_recommend.xml | 14 ++-- .../res/layout/item_erban_top_message.xml | 4 +- .../layout/item_family_currency_bill_date.xml | 8 +- ...tem_family_currency_transaction_record.xml | 10 +-- .../main/res/layout/item_family_game_list.xml | 4 +- app/src/main/res/layout/item_family_list.xml | 8 +- .../main/res/layout/item_family_manage_rv.xml | 10 +-- .../res/layout/item_family_member_list.xml | 10 +-- .../layout/item_family_weekly_rank_list.xml | 4 +- .../layout/item_friend_black_list_manage.xml | 4 +- app/src/main/res/layout/item_game_rank.xml | 10 +-- app/src/main/res/layout/item_gift.xml | 10 +-- app/src/main/res/layout/item_head_wear.xml | 4 +- .../main/res/layout/item_home_attention.xml | 2 +- .../res/layout/item_home_empty_ktv_room.xml | 4 +- .../layout/item_home_find_new_user_list.xml | 4 +- .../res/layout/item_home_find_newer_list.xml | 4 +- .../main/res/layout/item_home_hall_left.xml | 6 +- .../main/res/layout/item_home_hall_right.xml | 2 +- .../main/res/layout/item_home_ktv_room.xml | 18 ++--- .../res/layout/item_home_single_anchor.xml | 10 +-- .../layout/item_home_single_anchor_more.xml | 6 +- app/src/main/res/layout/item_live_tag.xml | 4 +- .../layout/item_lucky_money_member_list.xml | 4 +- .../main/res/layout/item_mic_queue_list.xml | 4 +- app/src/main/res/layout/item_micro_dating.xml | 6 +- .../res/layout/item_micro_dating_boss.xml | 6 +- app/src/main/res/layout/item_micro_game.xml | 6 +- .../main/res/layout/item_micro_game_mini.xml | 6 +- .../layout/item_micro_single_anchor_boss.xml | 6 +- .../res/layout/item_my_voice_in_review.xml | 12 +-- .../res/layout/item_my_voice_no_submitted.xml | 12 +-- .../res/layout/item_my_voice_verified.xml | 12 +-- .../res/layout/item_permission_granted.xml | 4 +- .../res/layout/item_pk_mic_queue_list.xml | 4 +- .../main/res/layout/item_preview_photo.xml | 8 +- .../main/res/layout/item_record_for_pk.xml | 12 +-- .../main/res/layout/item_team_member_list.xml | 4 +- ...em_team_weekly_bill_transcation_record.xml | 8 +- app/src/main/res/layout/item_user_game.xml | 2 +- .../main/res/layout/item_userinfo_skill.xml | 6 +- app/src/main/res/layout/item_voice_weal.xml | 2 +- .../res/layout/layout_anchor_card_view.xml | 7 +- app/src/main/res/layout/layout_bill_date.xml | 10 +-- .../main/res/layout/layout_bill_item_view.xml | 6 +- app/src/main/res/layout/layout_box_notify.xml | 4 +- app/src/main/res/layout/layout_car_detail.xml | 2 +- .../res/layout/layout_common_popup_dialog.xml | 8 +- app/src/main/res/layout/layout_cp_card.xml | 32 ++++---- .../res/layout/layout_cp_task_introduce.xml | 10 +-- app/src/main/res/layout/layout_desc_tag.xml | 6 +- .../main/res/layout/layout_flicker_avatar.xml | 6 +- app/src/main/res/layout/layout_gift_div.xml | 4 +- .../res/layout/layout_gift_indicator_item.xml | 4 +- .../main/res/layout/layout_home_notice.xml | 12 +-- app/src/main/res/layout/layout_level_head.xml | 2 +- .../res/layout/layout_member_in_notify.xml | 4 +- .../layout/layout_msg_view_holder_level.xml | 2 +- .../layout_msg_view_holder_red_packet.xml | 6 +- .../layout_msg_view_holder_voice_sys_msg.xml | 4 +- ...out_ok_cancel_label_dialog_big_message.xml | 8 +- app/src/main/res/layout/layout_ok_dialog.xml | 12 +-- .../res/layout/layout_pic_login_dialog.xml | 12 +-- .../main/res/layout/layout_pk_board_view.xml | 12 +-- .../main/res/layout/layout_skill_audio.xml | 10 +-- .../res/layout/layout_skill_card_title.xml | 12 +-- app/src/main/res/layout/layout_skill_edit.xml | 8 +- .../res/layout/layout_skill_selection.xml | 6 +- ...ice_bottle_filter_gender_bottom_dialog.xml | 16 ++-- .../res/layout/list_charge_bills_item.xml | 6 +- .../res/layout/list_income_gift_title.xml | 2 +- .../res/layout/list_item_auction_list.xml | 10 +-- ...st_item_find_star_family_list_vertical.xml | 4 +- app/src/main/res/layout/list_item_friend.xml | 4 +- .../main/res/layout/list_item_home_hall.xml | 10 +-- .../main/res/layout/list_item_micro_cp.xml | 2 +- .../main/res/layout/list_item_online_user.xml | 4 +- .../layout/list_item_online_user_mystery.xml | 2 +- .../main/res/layout/list_item_room_black.xml | 4 +- .../res/layout/list_item_room_consume.xml | 8 +- .../main/res/layout/list_item_room_normal.xml | 4 +- .../res/layout/list_item_user_photo_small.xml | 2 +- .../layout/list_item_user_photos_modify.xml | 2 +- .../main/res/layout/list_order_bills_item.xml | 10 +-- .../main/res/layout/list_red_packet_item.xml | 4 +- .../res/layout/list_withdraw_bills_item.xml | 6 +- app/src/main/res/layout/nim_msg_fragment.xml | 2 +- .../layout/nim_recent_contact_list_item.xml | 2 +- .../res/layout/number_calculator_layout.xml | 4 +- .../layout/room_invite_list_item_layout.xml | 6 +- .../res/layout/user_info_gift_list_layout.xml | 6 +- .../res/layout/view_main_home_load_more.xml | 6 +- app/src/main/res/layout/view_password.xml | 8 +- app/src/main/res/layout/withdraw_item.xml | 6 +- app/src/main/res/values/hello_styles.xml | 4 +- app/src/main/res/values/styles.xml | 26 +++--- .../res/layout/activity_matisse.xml | 7 +- .../res/layout/activity_media_preview.xml | 1 - .../res/layout/album_list_item.xml | 6 +- .../res/layout/media_grid_content.xml | 4 +- .../res/layout/item_nameplate_normal.xml | 2 +- .../res/layout/activity_module_clan.xml | 4 +- .../res/layout/activity_module_hall.xml | 4 +- .../res/layout/dialog_clan_time_picker.xml | 4 +- .../res/layout/item_live_tag_dialog.xml | 4 +- .../res/layout/fragment_share_music_list.xml | 14 ++-- .../room_msg_nim_recent_contact_list_item.xml | 2 +- .../res/layout/activity_easy_photos.xml | 10 --- .../layout/activity_preview_easy_photos.xml | 11 +-- .../layout/activity_puzzle_easy_photos.xml | 8 +- .../activity_puzzle_selector_easy_photos.xml | 5 -- .../layout/fragment_preview_easy_photos.xml | 2 - .../fragment_text_sticker_easy_photos.xml | 4 - .../item_dialog_album_items_easy_photos.xml | 5 -- ...em_preview_selected_photos_easy_photos.xml | 5 +- .../item_puzzle_selector_easy_photos.xml | 2 - ...em_puzzle_selector_preview_easy_photos.xml | 2 - .../res/layout/item_rv_photos_easy_photos.xml | 2 - libs/lib_crop/src/main/res/values/styles.xml | 6 +- .../res/layout/nim_action_bar_custom_view.xml | 2 +- .../nim_action_bar_right_clickable_tv.xml | 6 +- .../nim_action_bar_right_picker_preview.xml | 2 +- .../res/layout/nim_advanced_team_announce.xml | 2 +- .../nim_advanced_team_announce_list_item.xml | 18 ++--- .../nim_advanced_team_create_announce.xml | 8 +- .../nim_advanced_team_create_layout.xml | 12 +-- .../nim_advanced_team_info_activity.xml | 12 +-- .../nim_advanced_team_info_divider_item.xml | 8 +- .../nim_advanced_team_member_info_layout.xml | 16 ++-- .../nim_advanced_team_nickname_activity.xml | 4 +- .../res/layout/nim_ait_contact_label_item.xml | 2 +- .../res/layout/nim_ait_contact_robot_item.xml | 2 +- .../nim_ait_contact_team_member_item.xml | 2 +- .../res/layout/nim_capture_video_activity.xml | 10 +-- .../res/layout/nim_contact_text_item.xml | 8 +- .../res/layout/nim_contacts_abc_item.xml | 4 +- nim_uikit/res/layout/nim_contacts_item.xml | 6 +- nim_uikit/res/layout/nim_contacts_select.xml | 12 +-- .../res/layout/nim_contacts_select_item.xml | 10 +-- .../nim_easy_alert_dialog_default_layout.xml | 4 +- .../layout/nim_easy_alert_dialog_title.xml | 2 +- .../nim_easy_alert_dialog_with_edit_text.xml | 6 +- nim_uikit/res/layout/nim_menu_dialog_item.xml | 2 +- .../nim_message_activity_text_layout.xml | 4 +- nim_uikit/res/layout/nim_message_item.xml | 14 ++-- .../res/layout/nim_message_item_audio.xml | 6 +- .../res/layout/nim_message_item_location.xml | 4 +- .../layout/nim_message_item_notification.xml | 8 +- .../res/layout/nim_message_item_robot.xml | 4 +- nim_uikit/res/layout/nim_message_item_tip.xml | 4 +- .../res/layout/nim_message_item_unknown.xml | 10 +-- .../res/layout/nim_new_message_tip_layout.xml | 6 +- .../res/layout/nim_picker_album_activity.xml | 16 ++-- .../nim_picker_image_preview_activity.xml | 10 +-- .../layout/nim_picker_photofolder_item.xml | 4 +- .../layout/nim_popup_menu_black_layout.xml | 2 +- .../res/layout/nim_popup_menu_layout.xml | 2 +- .../layout/nim_popup_menu_list_black_item.xml | 8 +- .../res/layout/nim_popup_menu_list_item.xml | 8 +- ...nim_preview_image_from_camera_activity.xml | 4 +- .../nim_preview_image_from_local_activity.xml | 10 +-- .../layout/nim_recent_contact_list_item.xml | 22 ++--- nim_uikit/res/layout/nim_simple_load_more.xml | 4 +- .../res/layout/nim_sticker_picker_view.xml | 4 +- .../res/layout/nim_team_info_activity.xml | 8 +- .../res/layout/nim_team_info_divider_item.xml | 6 +- .../layout/nim_team_member_grid_layout.xml | 4 +- .../res/layout/nim_team_member_list_item.xml | 2 +- .../res/layout/nim_team_name_activity.xml | 4 +- .../res/layout/nim_time_text_view_layout.xml | 4 +- .../layout/nim_user_profile_toggle_item.xml | 4 +- .../res/layout/nim_voice_trans_layout.xml | 6 +- .../res/layout/nim_watch_picture_activity.xml | 2 +- .../res/layout/nim_watch_video_activity.xml | 10 +-- nim_uikit/res/values/styles-activity.xml | 4 +- nim_uikit/res/values/styles-widget.xml | 20 ++--- 264 files changed, 984 insertions(+), 1031 deletions(-) diff --git a/app/src/main/res/layout/activity_add_team_member.xml b/app/src/main/res/layout/activity_add_team_member.xml index cf0ea9848..25d5f5131 100644 --- a/app/src/main/res/layout/activity_add_team_member.xml +++ b/app/src/main/res/layout/activity_add_team_member.xml @@ -36,8 +36,8 @@ android:layout_width="0dp" android:layout_height="30dp" android:layout_gravity="center_vertical" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" android:layout_weight="1.0" android:background="@drawable/bg_family_member_search_edit" android:gravity="center_vertical" @@ -46,13 +46,13 @@ + android:paddingStart="@dimen/dp_15" + android:paddingEnd="@dimen/dp_15"> @@ -86,7 +86,7 @@ android:layout_gravity="center_vertical" android:gravity="center" android:onClick="@{click}" - android:paddingRight="16dp" + android:paddingEnd="16dp" android:text="@string/search" android:textColor="@color/text_primary" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/activity_audiorecord.xml b/app/src/main/res/layout/activity_audiorecord.xml index df2db57d8..aecbfdc48 100644 --- a/app/src/main/res/layout/activity_audiorecord.xml +++ b/app/src/main/res/layout/activity_audiorecord.xml @@ -77,8 +77,8 @@ android:layout_width="88dp" android:layout_height="88dp" android:layout_centerHorizontal="true" - android:layout_marginLeft="50dp" - android:layout_marginRight="50dp"> + android:layout_marginStart="50dp" + android:layout_marginEnd="50dp"> diff --git a/app/src/main/res/layout/activity_bills.xml b/app/src/main/res/layout/activity_bills.xml index 78d9bfeee..bb187a3d1 100644 --- a/app/src/main/res/layout/activity_bills.xml +++ b/app/src/main/res/layout/activity_bills.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/layout_activity_bills_01" android:textColor="@color/color_999999" android:textSize="18sp" /> @@ -42,8 +42,8 @@ android:layout_height="match_parent" android:layout_centerVertical="true" android:layout_toLeftOf="@+id/tv_selector_date" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:paddingStart="8dp" + android:paddingEnd="8dp" android:src="@mipmap/ic_day_today_yellow" android:visibility="visible" /> @@ -53,8 +53,8 @@ android:layout_height="match_parent" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:layout_marginRight="15dp" - android:paddingLeft="8dp" + android:layout_marginEnd="15dp" + android:paddingStart="8dp" android:src="@drawable/icon_date_yellow" /> @@ -88,7 +88,7 @@ android:layout_height="50dp" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:layout_marginBottom="50dp" android:src="@mipmap/ic_goto_top" /> diff --git a/app/src/main/res/layout/activity_bills_gift.xml b/app/src/main/res/layout/activity_bills_gift.xml index 1378659ae..6c8ad926e 100644 --- a/app/src/main/res/layout/activity_bills_gift.xml +++ b/app/src/main/res/layout/activity_bills_gift.xml @@ -34,10 +34,10 @@ android:layout_height="49dp" android:layout_alignParentBottom="true" android:background="@color/white" - android:drawableLeft="@drawable/icon_gold_num" + android:drawableStart="@drawable/icon_gold_num" android:drawablePadding="10dp" android:gravity="center_vertical" - android:paddingLeft="15dp" + android:paddingStart="15dp" android:text="52256225" android:textColor="@color/color_333333" android:textSize="14sp" @@ -50,7 +50,7 @@ android:layout_height="50dp" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:layout_marginBottom="50dp" android:src="@mipmap/ic_goto_top"/> diff --git a/app/src/main/res/layout/activity_cd_key_charge.xml b/app/src/main/res/layout/activity_cd_key_charge.xml index 1cb62d0a0..9afeed751 100644 --- a/app/src/main/res/layout/activity_cd_key_charge.xml +++ b/app/src/main/res/layout/activity_cd_key_charge.xml @@ -12,8 +12,8 @@ android:layout_width="match_parent" android:layout_height="88dp" android:layout_marginTop="25dp" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" android:background="@drawable/icon_cd_key_bg" > diff --git a/app/src/main/res/layout/activity_cp_task.xml b/app/src/main/res/layout/activity_cp_task.xml index e7a3260fb..1a2cfb9c9 100644 --- a/app/src/main/res/layout/activity_cp_task.xml +++ b/app/src/main/res/layout/activity_cp_task.xml @@ -20,9 +20,9 @@ android:layout_height="0dp" android:layout_marginTop="@dimen/dp_15" android:fillViewport="true" - android:paddingLeft="@dimen/dp_15" + android:paddingStart="@dimen/dp_15" android:paddingTop="@dimen/dp_8" - android:paddingRight="@dimen/dp_15" + android:paddingEnd="@dimen/dp_15" android:paddingBottom="@dimen/dp_8" app:layout_constraintBottom_toTopOf="@id/layout_task_bottom" app:layout_constraintTop_toBottomOf="@id/title_bar"> @@ -72,7 +72,7 @@ android:layout_height="@dimen/dp_40" android:background="@drawable/bg_cp_task_label_selected" android:gravity="center_vertical" - android:paddingLeft="@dimen/dp_15" + android:paddingStart="@dimen/dp_15" android:text="@string/layout_activity_cp_task_01" android:textColor="@color/white" android:textSize="@dimen/sp_18" @@ -117,7 +117,7 @@ android:id="@+id/iv_invite" android:layout_width="50dp" android:layout_height="50dp" - android:layout_marginRight="@dimen/dp_33" + android:layout_marginEnd="@dimen/dp_33" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="@id/iv_accept" app:layout_constraintTop_toTopOf="parent" /> @@ -126,7 +126,7 @@ android:id="@+id/tv_level" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_4" + android:layout_marginStart="@dimen/dp_4" android:textColor="@color/white" android:textSize="@dimen/sp_12" app:layout_constraintBottom_toTopOf="@id/progress_bar" @@ -139,9 +139,9 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="0dp" android:layout_height="12dp" - android:layout_marginLeft="@dimen/dp_4" + android:layout_marginStart="@dimen/dp_4" android:layout_marginTop="@dimen/dp_8" - android:layout_marginRight="@dimen/dp_8" + android:layout_marginEnd="@dimen/dp_8" android:max="100" android:progress="20" android:progressDrawable="@drawable/bg_cp_task_progress_bar" @@ -154,7 +154,7 @@ android:id="@+id/iv_drop_down" android:layout_width="@dimen/dp_24" android:layout_height="@dimen/dp_24" - android:layout_marginRight="@dimen/dp_4" + android:layout_marginEnd="@dimen/dp_4" android:src="@drawable/ic_cp_task_down" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/progress_bar" @@ -166,8 +166,8 @@ android:id="@+id/tv_progress" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="@dimen/dp_4" - android:paddingRight="@dimen/dp_4" + android:paddingStart="@dimen/dp_4" + android:paddingEnd="@dimen/dp_4" android:textColor="@color/white" android:textSize="8sp" app:layout_constraintBottom_toBottomOf="@id/progress_bar" diff --git a/app/src/main/res/layout/activity_create_pk.xml b/app/src/main/res/layout/activity_create_pk.xml index e54573f3d..6fec7b331 100644 --- a/app/src/main/res/layout/activity_create_pk.xml +++ b/app/src/main/res/layout/activity_create_pk.xml @@ -50,8 +50,8 @@ android:ellipsize="end" android:gravity="center" android:lines="1" - android:paddingLeft="6dp" - android:paddingRight="6dp" + android:paddingStart="6dp" + android:paddingEnd="6dp" android:text="@string/wait_for_mic" android:textColor="@color/color_FFFFFF" android:textSize="10dp" /> @@ -79,8 +79,8 @@ android:ellipsize="end" android:gravity="center" android:lines="1" - android:paddingLeft="6dp" - android:paddingRight="6dp" + android:paddingStart="6dp" + android:paddingEnd="6dp" android:text="@string/wait_for_mic" android:textColor="@color/color_FFFFFF" android:textSize="10dp" /> @@ -109,8 +109,8 @@ android:ellipsize="end" android:gravity="center" android:lines="1" - android:paddingLeft="6dp" - android:paddingRight="6dp" + android:paddingStart="6dp" + android:paddingEnd="6dp" android:text="@string/wait_for_mic" android:textColor="@color/color_FFFFFF" android:textSize="10dp" /> @@ -140,8 +140,8 @@ android:ellipsize="end" android:gravity="center" android:lines="1" - android:paddingLeft="6dp" - android:paddingRight="6dp" + android:paddingStart="6dp" + android:paddingEnd="6dp" android:text="@string/wait_for_mic" android:textColor="@color/color_FFFFFF" android:textSize="10dp" /> @@ -154,8 +154,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" + android:layout_marginStart="10dp" + android:layout_marginEnd="10dp" android:src="@mipmap/ic_pk_vs" /> @@ -217,8 +217,8 @@ android:ellipsize="end" android:gravity="center" android:lines="1" - android:paddingLeft="6dp" - android:paddingRight="6dp" + android:paddingStart="6dp" + android:paddingEnd="6dp" android:text="@string/wait_for_mic" android:textColor="@color/color_FFFFFF" android:textSize="10dp" /> @@ -247,8 +247,8 @@ android:ellipsize="end" android:gravity="center" android:lines="1" - android:paddingLeft="6dp" - android:paddingRight="6dp" + android:paddingStart="6dp" + android:paddingEnd="6dp" android:text="@string/wait_for_mic" android:textColor="@color/color_FFFFFF" android:textSize="10dp" /> @@ -277,8 +277,8 @@ android:ellipsize="end" android:gravity="center" android:lines="1" - android:paddingLeft="6dp" - android:paddingRight="6dp" + android:paddingStart="6dp" + android:paddingEnd="6dp" android:text="@string/wait_for_mic" android:textColor="@color/color_FFFFFF" android:textSize="10dp" /> @@ -296,8 +296,8 @@ android:layout_height="55dp" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingLeft="@dimen/dp_15" - android:paddingRight="@dimen/dp_15" + android:paddingStart="@dimen/dp_15" + android:paddingEnd="@dimen/dp_15" android:weightSum="10"> @@ -362,9 +362,9 @@ android:id="@+id/rb_vote_type_gift_member" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="10dp" + android:layout_marginStart="10dp" android:button="@drawable/selector_radio_btn" - android:paddingLeft="5dp" + android:paddingStart="5dp" android:text="@string/vote_type_gift_member" android:textColor="@color/text_normal_c6c6e9" android:textSize="14sp" /> @@ -376,8 +376,8 @@ @@ -387,8 +387,8 @@ android:layout_height="55dp" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingLeft="@dimen/dp_15" - android:paddingRight="@dimen/dp_15" + android:paddingStart="@dimen/dp_15" + android:paddingEnd="@dimen/dp_15" android:weightSum="10"> @@ -420,8 +420,8 @@ @@ -434,8 +434,8 @@ android:layout_width="match_parent" android:layout_height="40dp" android:layout_alignParentBottom="true" - android:layout_marginLeft="@dimen/dp_15" - android:layout_marginRight="@dimen/dp_15" + android:layout_marginStart="@dimen/dp_15" + android:layout_marginEnd="@dimen/dp_15" android:layout_marginBottom="20dp" android:background="@drawable/base_selector_theme_30dp" android:gravity="center" @@ -455,8 +455,8 @@ android:id="@+id/tv_recreate_btn" android:layout_width="match_parent" android:layout_height="40dp" - android:layout_marginLeft="@dimen/dp_15" - android:layout_marginRight="@dimen/dp_15" + android:layout_marginStart="@dimen/dp_15" + android:layout_marginEnd="@dimen/dp_15" android:background="@drawable/base_selector_theme_30dp" android:gravity="center" android:text="@string/recreate_pk" @@ -467,9 +467,9 @@ android:id="@+id/tv_close_pk_mode" android:layout_width="match_parent" android:layout_height="40dp" - android:layout_marginLeft="@dimen/dp_15" + android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="15dp" - android:layout_marginRight="@dimen/dp_15" + android:layout_marginEnd="@dimen/dp_15" android:background="@drawable/base_shape_negative_30dp" android:gravity="center" android:text="@string/close_pk_mode" diff --git a/app/src/main/res/layout/activity_create_team_message.xml b/app/src/main/res/layout/activity_create_team_message.xml index 91dd03cdf..81d4865b9 100644 --- a/app/src/main/res/layout/activity_create_team_message.xml +++ b/app/src/main/res/layout/activity_create_team_message.xml @@ -161,7 +161,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_marginRight="@dimen/dp_15" + android:layout_marginEnd="@dimen/dp_15" android:textColor="@color/text_color_secondary" android:textSize="@dimen/dp_12" android:visibility="gone" @@ -196,7 +196,7 @@ android:id="@+id/iv_select_member_2" android:layout_width="40dp" android:layout_height="40dp" - android:layout_marginLeft="21dp" + android:layout_marginStart="21dp" android:layout_marginTop="15dp" android:layout_marginBottom="15dp" android:scaleType="centerCrop" @@ -206,7 +206,7 @@ android:id="@+id/iv_select_member_3" android:layout_width="40dp" android:layout_height="40dp" - android:layout_marginLeft="21dp" + android:layout_marginStart="21dp" android:layout_marginTop="15dp" android:layout_marginBottom="15dp" android:scaleType="centerCrop" @@ -216,7 +216,7 @@ android:id="@+id/iv_select_member_4" android:layout_width="40dp" android:layout_height="40dp" - android:layout_marginLeft="21dp" + android:layout_marginStart="21dp" android:layout_marginTop="15dp" android:layout_marginBottom="15dp" android:scaleType="centerCrop" @@ -226,7 +226,7 @@ android:id="@+id/iv_select_member_5" android:layout_width="40dp" android:layout_height="40dp" - android:layout_marginLeft="21dp" + android:layout_marginStart="21dp" android:layout_marginTop="15dp" android:layout_marginBottom="15dp" android:scaleType="centerCrop" @@ -236,7 +236,7 @@ android:id="@+id/iv_select_member_6" android:layout_width="40dp" android:layout_height="40dp" - android:layout_marginLeft="21dp" + android:layout_marginStart="21dp" android:layout_marginTop="15dp" android:layout_marginBottom="15dp" android:scaleType="centerCrop" diff --git a/app/src/main/res/layout/activity_fans.xml b/app/src/main/res/layout/activity_fans.xml index 7886b3c82..b0f58ccda 100644 --- a/app/src/main/res/layout/activity_fans.xml +++ b/app/src/main/res/layout/activity_fans.xml @@ -23,9 +23,9 @@ android:layout_width="match_parent" android:layout_height="32dp" android:layout_gravity="center_vertical" - android:layout_marginLeft="@dimen/dp_15" + android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="@dimen/dp_8" - android:layout_marginRight="@dimen/dp_15" + android:layout_marginEnd="@dimen/dp_15" android:background="@drawable/bg_search_edit" android:gravity="center_vertical" android:orientation="horizontal" diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml index 08c984c8b..391a5810b 100644 --- a/app/src/main/res/layout/activity_feedback.xml +++ b/app/src/main/res/layout/activity_feedback.xml @@ -21,10 +21,10 @@ @@ -36,7 +36,7 @@ android:layout_marginStart="15dp" android:layout_marginEnd="15dp" android:background="@drawable/bg_secondary_radius_15" - android:gravity="left" + android:gravity="start" android:hint="@string/layout_activity_feedback_02" android:padding="10dp" android:textColor="@color/text_normal_c6c6e9" diff --git a/app/src/main/res/layout/activity_granted_permissions.xml b/app/src/main/res/layout/activity_granted_permissions.xml index 2f0f01015..ddec70433 100644 --- a/app/src/main/res/layout/activity_granted_permissions.xml +++ b/app/src/main/res/layout/activity_granted_permissions.xml @@ -57,7 +57,7 @@ android:background="@color/color_grey_999999" /> diff --git a/app/src/main/res/layout/activity_jewel.xml b/app/src/main/res/layout/activity_jewel.xml index fecc56b57..ed3f8ecd7 100644 --- a/app/src/main/res/layout/activity_jewel.xml +++ b/app/src/main/res/layout/activity_jewel.xml @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="4dp" + android:layout_marginStart="4dp" android:layout_toEndOf="@id/iv_diamond_color" android:text="@string/layout_activity_jewel_01" android:textColor="@color/color_333333" @@ -83,7 +83,7 @@ @@ -156,9 +156,9 @@ android:layout_height="39dp" android:layout_above="@+id/tv_jewel_tixian" android:layout_gravity="center_horizontal" - android:layout_marginLeft="23dp" + android:layout_marginStart="23dp" android:layout_marginTop="10dp" - android:layout_marginRight="23dp" + android:layout_marginEnd="23dp" android:background="@drawable/shape_semi_round_gray_solid" android:gravity="center" android:text="@string/layout_activity_jewel_06" @@ -171,9 +171,9 @@ android:layout_height="39dp" android:layout_above="@+id/tv_bottom_tips" android:layout_gravity="center_horizontal" - android:layout_marginLeft="23dp" + android:layout_marginStart="23dp" android:layout_marginTop="20dp" - android:layout_marginRight="23dp" + android:layout_marginEnd="23dp" android:background="@drawable/shape_semi_round_gray_solid" android:gravity="center" android:text="@string/layout_activity_jewel_07" diff --git a/app/src/main/res/layout/activity_lucky_money_detail.xml b/app/src/main/res/layout/activity_lucky_money_detail.xml index 7df7bb00d..e4a19ddef 100644 --- a/app/src/main/res/layout/activity_lucky_money_detail.xml +++ b/app/src/main/res/layout/activity_lucky_money_detail.xml @@ -129,8 +129,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="12dp" - android:layout_marginLeft="@dimen/dp_10" - android:layout_marginRight="@dimen/dp_10" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginEnd="@dimen/dp_10" android:layout_marginTop="12dp" android:gravity="center_vertical|start" android:orientation="horizontal"> diff --git a/app/src/main/res/layout/activity_modify_info.xml b/app/src/main/res/layout/activity_modify_info.xml index dd97ebea8..2404b995d 100644 --- a/app/src/main/res/layout/activity_modify_info.xml +++ b/app/src/main/res/layout/activity_modify_info.xml @@ -21,8 +21,8 @@ android:id="@+id/rl_content_group" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" android:padding="11dp" @@ -53,12 +53,12 @@ android:layout_width="match_parent" android:background="@drawable/bg_secondary_radius_15" android:orientation="horizontal" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" - android:paddingLeft="10dp" - android:paddingRight="10dp" + android:paddingStart="10dp" + android:paddingEnd="10dp" android:gravity="center_vertical" android:layout_height="wrap_content" android:visibility="gone"> diff --git a/app/src/main/res/layout/activity_my_voice.xml b/app/src/main/res/layout/activity_my_voice.xml index c423f0252..f876f1933 100644 --- a/app/src/main/res/layout/activity_my_voice.xml +++ b/app/src/main/res/layout/activity_my_voice.xml @@ -17,9 +17,9 @@ android:layout_width="match_parent" android:layout_height="150dp" android:background="@drawable/bg_my_voice_vie_stub" - android:paddingLeft="15dp" + android:paddingStart="15dp" android:paddingTop="26dp" - android:paddingRight="15dp" + android:paddingEnd="15dp" android:paddingBottom="26dp" android:visibility="gone" tools:visibility="visible" />--> @@ -34,9 +34,9 @@ android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingLeft="15dp" + android:paddingStart="15dp" android:paddingTop="26dp" - android:paddingRight="15dp" + android:paddingEnd="15dp" android:paddingBottom="26dp" /> diff --git a/app/src/main/res/layout/activity_new_user_list.xml b/app/src/main/res/layout/activity_new_user_list.xml index 69cad502d..f720e81b5 100644 --- a/app/src/main/res/layout/activity_new_user_list.xml +++ b/app/src/main/res/layout/activity_new_user_list.xml @@ -25,9 +25,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:paddingLeft="15dp" + android:paddingStart="15dp" android:paddingTop="12dp" - android:paddingRight="15dp" + android:paddingEnd="15dp" android:paddingBottom="12dp" /> diff --git a/app/src/main/res/layout/activity_nim_add_black_list.xml b/app/src/main/res/layout/activity_nim_add_black_list.xml index 23fc315fb..119a95e25 100644 --- a/app/src/main/res/layout/activity_nim_add_black_list.xml +++ b/app/src/main/res/layout/activity_nim_add_black_list.xml @@ -23,7 +23,7 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_centerVertical="true" - android:layout_marginLeft="10dp" + android:layout_marginStart="10dp" tools:background="@drawable/default_avatar" /> @@ -63,7 +63,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:drawableLeft="@drawable/shape_pm_point" + android:drawableStart="@drawable/shape_pm_point" android:drawablePadding="10dp" android:text="@string/layout_activity_patriarch_mode_03" android:textColor="@color/text_normal_c6c6e9" @@ -73,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:drawableLeft="@drawable/shape_pm_point" + android:drawableStart="@drawable/shape_pm_point" android:drawablePadding="10dp" android:text="@string/layout_activity_patriarch_mode_04" android:textColor="@color/text_normal_c6c6e9" @@ -83,7 +83,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:drawableLeft="@drawable/shape_pm_point" + android:drawableStart="@drawable/shape_pm_point" android:drawablePadding="10dp" android:text="@string/layout_activity_patriarch_mode_05" android:textColor="@color/text_normal_c6c6e9" diff --git a/app/src/main/res/layout/activity_recyclerview_bind.xml b/app/src/main/res/layout/activity_recyclerview_bind.xml index 37daa21cf..96b222e8d 100644 --- a/app/src/main/res/layout/activity_recyclerview_bind.xml +++ b/app/src/main/res/layout/activity_recyclerview_bind.xml @@ -23,8 +23,8 @@ android:id="@+id/swipe_refresh" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="15dp" - android:layout_marginRight="5dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="5dp" android:layout_marginTop="15dp" android:background="@color/color_FAFAFA" android:refreshing="@{viewmodel.loading}"> diff --git a/app/src/main/res/layout/activity_room_setting.xml b/app/src/main/res/layout/activity_room_setting.xml index dc114c3a8..38132acaf 100644 --- a/app/src/main/res/layout/activity_room_setting.xml +++ b/app/src/main/res/layout/activity_room_setting.xml @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/layout_activity_room_setting_01" android:textColor="@color/text_title_color" android:textSize="@dimen/sp_15" /> @@ -82,7 +82,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/layout_activity_room_setting_03" android:textColor="@color/text_title_color" android:textSize="@dimen/sp_15" /> @@ -102,7 +102,7 @@ android:id="@+id/pwd_edit" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:layout_toRightOf="@id/pwd_text" android:background="@null" android:hint="@string/layout_activity_room_setting_04" @@ -161,7 +161,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/layout_activity_room_setting_05" android:textColor="@color/text_title_color" android:textSize="@dimen/sp_15" /> @@ -202,7 +202,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/layout_activity_room_setting_07" android:textColor="@color/text_title_color" android:textSize="@dimen/sp_15" /> @@ -240,7 +240,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/layout_activity_room_setting_09" android:textColor="@color/text_title_color" android:textSize="@dimen/sp_15" /> @@ -250,7 +250,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:src="@drawable/arrow_right" /> @@ -271,7 +271,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/layout_activity_room_setting_010" android:textColor="@color/text_title_color" android:textSize="@dimen/sp_15" /> @@ -281,7 +281,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:src="@drawable/arrow_right" /> @@ -302,7 +302,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/room_bg_text" android:textColor="@color/text_title_color" android:textSize="@dimen/sp_15" /> @@ -312,7 +312,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:src="@drawable/arrow_right" /> @@ -336,7 +336,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:src="@drawable/arrow_right" /> @@ -388,7 +388,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/layout_activity_room_setting_013" android:textColor="@color/text_title_color" android:textSize="@dimen/sp_15" /> diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index bb9285f20..fc0b144f9 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -177,8 +177,8 @@ android:id="@+id/indicator" android:layout_width="match_parent" android:layout_height="48dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" /> + android:paddingStart="5dp" + android:paddingEnd="5dp" /> diff --git a/app/src/main/res/layout/activity_skill_home.xml b/app/src/main/res/layout/activity_skill_home.xml index d38ce7190..c02badc7d 100644 --- a/app/src/main/res/layout/activity_skill_home.xml +++ b/app/src/main/res/layout/activity_skill_home.xml @@ -34,8 +34,8 @@ android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginLeft="@dimen/dp_15" - android:layout_marginRight="@dimen/dp_15" + android:layout_marginStart="@dimen/dp_15" + android:layout_marginEnd="@dimen/dp_15" android:layout_marginBottom="@dimen/dp_15" app:layout_constraintTop_toBottomOf="@id/title_bar" /> diff --git a/app/src/main/res/layout/activity_team_member_list.xml b/app/src/main/res/layout/activity_team_member_list.xml index 15fc223d5..93e5e8bb3 100644 --- a/app/src/main/res/layout/activity_team_member_list.xml +++ b/app/src/main/res/layout/activity_team_member_list.xml @@ -37,8 +37,8 @@ android:layout_width="0dp" android:layout_height="30dp" android:layout_gravity="center_vertical" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" android:layout_weight="1.0" android:background="@drawable/bg_family_member_search_edit" android:gravity="center_vertical" @@ -47,13 +47,13 @@ + android:paddingStart="@dimen/dp_15" + android:paddingEnd="@dimen/dp_15"> diff --git a/app/src/main/res/layout/activity_team_member_search_list.xml b/app/src/main/res/layout/activity_team_member_search_list.xml index 9a9cc35d5..9cf9849cb 100644 --- a/app/src/main/res/layout/activity_team_member_search_list.xml +++ b/app/src/main/res/layout/activity_team_member_search_list.xml @@ -36,7 +36,7 @@ android:layout_width="0dp" android:layout_height="29dp" android:layout_gravity="center_vertical" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:layout_weight="1.0" android:background="@drawable/bg_search_edit" android:gravity="center_vertical" @@ -46,14 +46,14 @@ android:id="@+id/search_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:src="@mipmap/icon_little_search" /> @@ -87,7 +87,7 @@ android:layout_gravity="center_vertical" android:gravity="center" android:onClick="@{click}" - android:paddingRight="16dp" + android:paddingEnd="16dp" android:text="@string/search" android:textColor="@color/text_primary" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/activity_team_weekly_bill_search.xml b/app/src/main/res/layout/activity_team_weekly_bill_search.xml index 5dc6d6b33..e8ae6fd40 100644 --- a/app/src/main/res/layout/activity_team_weekly_bill_search.xml +++ b/app/src/main/res/layout/activity_team_weekly_bill_search.xml @@ -36,7 +36,7 @@ android:layout_width="0dp" android:layout_height="29dp" android:layout_gravity="center_vertical" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:layout_weight="1.0" android:background="@drawable/bg_search_edit" android:gravity="center_vertical" @@ -46,14 +46,14 @@ android:id="@+id/search_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:src="@mipmap/icon_little_search" /> @@ -87,7 +87,7 @@ android:layout_gravity="center_vertical" android:gravity="center" android:onClick="@{click}" - android:paddingRight="16dp" + android:paddingEnd="16dp" android:text="@string/search" android:textColor="@color/text_primary" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/activity_user_info_modify.xml b/app/src/main/res/layout/activity_user_info_modify.xml index bc9989fde..5b9a7d591 100644 --- a/app/src/main/res/layout/activity_user_info_modify.xml +++ b/app/src/main/res/layout/activity_user_info_modify.xml @@ -84,15 +84,15 @@ + android:paddingStart="15dp" + android:paddingEnd="15dp"> diff --git a/app/src/main/res/layout/activity_withdraw_bills.xml b/app/src/main/res/layout/activity_withdraw_bills.xml index fc735ef4f..a67214e62 100644 --- a/app/src/main/res/layout/activity_withdraw_bills.xml +++ b/app/src/main/res/layout/activity_withdraw_bills.xml @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:text="@string/layout_activity_withdraw_bills_01" android:textColor="@color/color_999999" android:textSize="18sp" /> @@ -41,8 +41,8 @@ android:layout_height="match_parent" android:layout_centerVertical="true" android:layout_toLeftOf="@+id/tv_selector_date" - android:paddingLeft="8dp" - android:paddingRight="8dp" + android:paddingStart="8dp" + android:paddingEnd="8dp" android:src="@mipmap/ic_day_today_yellow" android:visibility="visible" /> @@ -52,8 +52,8 @@ android:layout_height="match_parent" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:layout_marginRight="15dp" - android:paddingLeft="8dp" + android:layout_marginEnd="15dp" + android:paddingStart="8dp" android:src="@drawable/icon_date_yellow" /> @@ -73,7 +73,7 @@ android:layout_height="50dp" android:layout_alignParentRight="true" android:layout_alignParentBottom="true" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:layout_marginBottom="50dp" android:src="@mipmap/ic_goto_top" /> diff --git a/app/src/main/res/layout/default_toolbar_layout.xml b/app/src/main/res/layout/default_toolbar_layout.xml index f003e533a..3749f38a0 100644 --- a/app/src/main/res/layout/default_toolbar_layout.xml +++ b/app/src/main/res/layout/default_toolbar_layout.xml @@ -10,7 +10,7 @@ + android:layout_marginEnd="10dp"> @@ -62,20 +62,20 @@ android:id="@+id/iv_minus" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:src="@drawable/icon_minus" /> diff --git a/app/src/main/res/layout/dialog_bottom_auction_plus.xml b/app/src/main/res/layout/dialog_bottom_auction_plus.xml index 9dcb8ca91..cdf1fca8c 100644 --- a/app/src/main/res/layout/dialog_bottom_auction_plus.xml +++ b/app/src/main/res/layout/dialog_bottom_auction_plus.xml @@ -20,7 +20,7 @@ android:layout_gravity="center" android:layout_marginBottom="15dp" android:layout_marginTop="18dp" - android:drawableLeft="@drawable/icon_trophy_first" + android:drawableStart="@drawable/icon_trophy_first" android:drawablePadding="5dp" android:text="@string/layout_dialog_bottom_auction_plus_01" android:textColor="@color/text_primary" @@ -105,7 +105,7 @@ android:id="@+id/rb_one" android:layout_width="68dp" android:layout_height="29dp" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:background="@drawable/selector_auction_price" android:button="@null" android:gravity="center" @@ -117,7 +117,7 @@ android:id="@+id/rb_two" android:layout_width="68dp" android:layout_height="29dp" - android:layout_marginRight="15dp" + android:layout_marginEnd="15dp" android:background="@drawable/selector_auction_price" android:button="@null" android:gravity="center" @@ -140,7 +140,7 @@ android:id="@+id/rb_four" android:layout_width="68dp" android:layout_height="29dp" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:background="@drawable/selector_auction_price" android:button="@null" android:gravity="center" @@ -191,7 +191,7 @@ android:id="@+id/iv_minus" android:layout_width="40dp" android:layout_height="match_parent" - android:layout_marginRight="10dp" + android:layout_marginEnd="10dp" android:scaleType="center" android:src="@drawable/icon_minus" /> @@ -200,10 +200,10 @@ android:layout_width="130dp" android:layout_height="29dp" android:background="@drawable/shape_semi_round_white_solid_black_stroke" - android:drawableRight="@drawable/icon_gold" + android:drawableEnd="@drawable/icon_gold" android:gravity="center" - android:paddingLeft="6dp" - android:paddingRight="6dp" + android:paddingStart="6dp" + android:paddingEnd="6dp" android:text="0" android:textColor="@color/text_primary" android:textSize="18dp" /> @@ -221,16 +221,16 @@ + android:paddingStart="@dimen/common_item_view_margin_left_right">