From 95f7c525ab643f9cf0c766227b6b11feb3f644c3 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Wed, 24 May 2023 18:06:30 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E9=98=BF=E6=8B=89=E4=BC=AF=E8=AF=AD?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/values/styles.xml | 2 +- .../erban/avroom/widget/MagicTextView.java | 4 +- .../widget/rollviewpager/RollPagerView.java | 10 +-- .../res/layout/activity_add_team_member.xml | 12 +-- .../main/res/layout/activity_audiorecord.xml | 4 +- app/src/main/res/layout/activity_bills.xml | 4 +- .../res/layout/activity_binder_alipay.xml | 30 +++---- .../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 | 78 +++++++++---------- .../layout/activity_create_team_message.xml | 12 +-- .../res/layout/activity_exchange_gold.xml | 32 ++++---- .../main/res/layout/activity_family_home.xml | 32 ++++---- .../main/res/layout/activity_family_info.xml | 24 +++--- .../layout/activity_family_list_member.xml | 12 +-- .../layout/activity_family_member_search.xml | 12 +-- .../main/res/layout/activity_family_plaza.xml | 4 +- .../res/layout/activity_family_search.xml | 12 +-- app/src/main/res/layout/activity_fans.xml | 4 +- app/src/main/res/layout/activity_feedback.xml | 2 +- .../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 | 4 +- .../res/layout/activity_new_user_list.xml | 4 +- .../layout/activity_nim_add_black_list.xml | 8 +- .../main/res/layout/activity_open_room.xml | 10 +-- .../res/layout/activity_patriarch_mode.xml | 2 +- .../res/layout/activity_recyclerview_bind.xml | 4 +- .../main/res/layout/activity_room_setting.xml | 34 ++++---- app/src/main/res/layout/activity_search.xml | 4 +- .../main/res/layout/activity_search_hall.xml | 4 +- .../main/res/layout/activity_send_gold.xml | 2 +- app/src/main/res/layout/activity_setting.xml | 8 +- .../main/res/layout/activity_skill_edit.xml | 2 +- .../main/res/layout/activity_skill_home.xml | 4 +- .../res/layout/activity_team_member_list.xml | 12 +-- .../activity_team_member_search_list.xml | 12 +-- .../activity_team_weekly_bill_search.xml | 12 +-- .../main/res/layout/activity_user_info.xml | 4 +- .../res/layout/activity_user_info_modify.xml | 36 ++++----- app/src/main/res/layout/activity_withdraw.xml | 26 +++---- .../res/layout/activity_withdraw_bills.xml | 16 ++-- .../res/layout/default_toolbar_layout.xml | 4 +- .../main/res/layout/dialog_bottom_auction.xml | 14 ++-- .../res/layout/dialog_bottom_auction_plus.xml | 18 ++--- .../main/res/layout/dialog_bottom_face.xml | 4 +- .../main/res/layout/dialog_bottom_gift.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 +- ..._custom_voice_match_sync_history_voice.xml | 12 +-- .../main/res/layout/dialog_disband_family.xml | 4 +- .../dialog_family_currency_contribution.xml | 18 ++--- .../dialog_family_currency_transfer.xml | 12 +-- .../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 +- .../res/layout/dialog_gift_all_service.xml | 12 +-- app/src/main/res/layout/dialog_level_up.xml | 4 +- .../layout/dialog_manual_quantity_gift.xml | 6 +- .../main/res/layout/dialog_pk_mic_queue.xml | 4 +- app/src/main/res/layout/dialog_pk_result.xml | 10 +-- .../main/res/layout/dialog_pk_score_board.xml | 4 +- .../res/layout/dialog_pub_room_shutup.xml | 20 ++--- .../main/res/layout/dialog_request_upmic.xml | 4 +- .../main/res/layout/dialog_room_impose.xml | 8 +- app/src/main/res/layout/dialog_user_info.xml | 6 +- .../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 | 7 +- .../res/layout/fragment_association_room.xml | 4 +- .../res/layout/fragment_dialog_room_title.xml | 4 +- app/src/main/res/layout/fragment_family.xml | 34 ++++---- app/src/main/res/layout/fragment_find_tab.xml | 4 +- .../main/res/layout/fragment_game_list.xml | 4 +- .../main/res/layout/fragment_gift_income.xml | 12 +-- app/src/main/res/layout/fragment_me.xml | 10 +-- app/src/main/res/layout/fragment_msg.xml | 4 +- .../res/layout/fragment_radish_record.xml | 12 +-- .../main/res/layout/fragment_userinfo_cp.xml | 4 +- .../res/layout/fragment_userinfo_info.xml | 2 +- .../res/layout/fragment_userinfo_userinfo.xml | 4 +- .../main/res/layout/fragment_voice_card.xml | 4 +- .../res/layout/header_famiy_currency_bill.xml | 14 ++-- .../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_undrive.xml | 4 +- .../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 | 18 ++--- .../res/layout/item_erban_top_message.xml | 4 +- .../layout/item_family_currency_bill_date.xml | 4 +- ...tem_family_currency_transaction_record.xml | 8 +- .../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 | 14 ++-- 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 +- .../main/res/layout/item_ktv_boss_micro.xml | 2 +- .../res/layout/item_ktv_search_history.xml | 4 +- .../main/res/layout/item_ktv_type_room.xml | 12 +-- 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 | 6 +- 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 | 6 +- .../res/layout/item_pk_select_people_rv.xml | 2 +- .../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 | 6 +- 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 | 5 +- .../main/res/layout/layout_bill_item_view.xml | 8 +- app/src/main/res/layout/layout_box_notify.xml | 4 +- .../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 +-- .../main/res/layout/layout_des_personal.xml | 4 +- app/src/main/res/layout/layout_des_photo.xml | 4 +- app/src/main/res/layout/layout_desc_tag.xml | 6 +- app/src/main/res/layout/layout_desc_voice.xml | 12 +-- .../main/res/layout/layout_flicker_avatar.xml | 6 +- app/src/main/res/layout/layout_gift_div.xml | 4 +- .../main/res/layout/layout_gift_effect.xml | 10 +-- .../res/layout/layout_gift_indicator_item.xml | 4 +- .../main/res/layout/layout_home_notice.xml | 14 ++-- .../res/layout/layout_member_in_notify.xml | 4 +- .../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 | 6 +- .../res/layout/layout_skill_selection.xml | 4 +- .../main/res/layout/layout_user_family.xml | 8 +- ...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_attention_user.xml | 2 +- .../res/layout/list_item_auction_list.xml | 10 +-- .../main/res/layout/list_item_dialog_gift.xml | 2 +- app/src/main/res/layout/list_item_face.xml | 5 +- ...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 +-- .../res/layout/list_item_home_room_banner.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 | 4 +- .../main/res/layout/list_order_bills_item.xml | 12 +-- .../main/res/layout/list_red_packet_item.xml | 4 +- .../res/layout/list_withdraw_bills_item.xml | 8 +- .../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_give_gold_password.xml | 4 +- app/src/main/res/layout/view_password.xml | 4 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 6 +- app/src/main/res/values/attrs.xml | 2 +- app/src/main/res/values/hello_styles.xml | 4 +- app/src/main/res/values/strings.xml | 4 +- app/src/main/res/values/styles.xml | 24 +++--- .../res/layout/activity_matisse.xml | 5 +- .../res/layout/activity_media_preview.xml | 3 +- .../res/layout/album_list_item.xml | 4 +- .../res/layout/media_grid_content.xml | 4 +- .../res/layout/activity_give_gold_search.xml | 10 +-- .../res/layout/activity_give_gold.xml | 4 +- .../res/layout/fragment_square_dynamic.xml | 4 +- .../res/layout/head_dynamic_detail.xml | 4 +- .../res/layout/item_preview_photo.xml | 6 +- .../res/layout/item_square_dynamic.xml | 2 +- .../res/layout/item_world_dynamic.xml | 8 +- .../res/layout/layout_dy_nick_detail.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/view_holder_mentoring_tips.xml | 8 +- .../res/layout/activity_mini_world_edit.xml | 4 +- .../layout/activity_mini_world_guest_page.xml | 4 +- .../activity_mini_world_member_list.xml | 4 +- .../dialog_mini_world_guest_page_invite.xml | 4 +- .../res/layout/fragment_single_room.xml | 4 +- .../res/layout/frg_mini_world_notice.xml | 7 +- .../res/layout/item_mini_world_main_item.xml | 10 +-- .../layout/item_mini_world_member_list.xml | 4 +- .../nim_recent_contact_team_list_item.xml | 4 +- .../module_mini_world/res/values/styles.xml | 4 +- .../res/layout/fragment_share_music_list.xml | 14 ++-- ...tivity_public_chat_hall_search_friends.xml | 12 +-- .../res/layout/item_im_tips.xml | 4 +- .../layout/item_message_public_chat_hall.xml | 12 +-- .../item_public_chat_hall_attention_list.xml | 4 +- .../item_public_chat_hall_fans_list.xml | 4 +- .../item_public_chat_hall_friend_list.xml | 4 +- .../layout/layout_public_chat_hall_text.xml | 4 +- .../res/layout/list_item_micro_cp.xml | 2 +- .../res/layout/nim_msg_fragment.xml | 2 +- .../room_msg_nim_recent_contact_list_item.xml | 2 +- .../res/layout/box_rank_view_load_more.xml | 4 +- .../easyphoto/models/puzzle/Area.java | 2 +- .../models/puzzle/slant/SlantArea.java | 36 ++++----- .../models/puzzle/straight/StraightArea.java | 10 +-- .../res/layout/activity_easy_photos.xml | 10 --- .../layout/activity_preview_easy_photos.xml | 18 +---- .../layout/activity_puzzle_easy_photos.xml | 12 +-- .../activity_puzzle_selector_easy_photos.xml | 7 -- .../layout/fragment_preview_easy_photos.xml | 2 - .../fragment_text_sticker_easy_photos.xml | 8 -- .../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 - .../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 | 14 ++-- .../nim_advanced_team_info_divider_item.xml | 10 +-- .../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 | 12 +-- .../res/layout/nim_contact_text_item.xml | 8 +- nim_uikit/res/layout/nim_contacts.xml | 2 +- .../res/layout/nim_contacts_abc_item.xml | 4 +- nim_uikit/res/layout/nim_contacts_item.xml | 12 +-- nim_uikit/res/layout/nim_contacts_select.xml | 16 ++-- .../res/layout/nim_contacts_select_item.xml | 10 +-- .../nim_easy_alert_dialog_default_layout.xml | 2 +- .../layout/nim_easy_alert_dialog_title.xml | 4 +- .../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 | 18 ++--- .../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 | 8 +- .../res/layout/nim_new_message_tip_layout.xml | 6 +- .../res/layout/nim_picker_album_activity.xml | 20 ++--- .../nim_picker_image_preview_activity.xml | 10 +-- .../res/layout/nim_picker_photo_grid_item.xml | 2 +- .../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 | 41 +++++----- 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 | 10 +-- .../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 | 8 +- .../res/layout/nim_voice_trans_layout.xml | 6 +- .../res/layout/nim_watch_picture_activity.xml | 2 +- .../res/layout/nim_watch_video_activity.xml | 8 +- nim_uikit/res/values/styles-activity.xml | 4 +- nim_uikit/res/values/styles-widget.xml | 20 ++--- .../ui/draggablebubbles/BubbleView.java | 2 +- .../ui/ptr2/SuperSwipeRefreshLayout.java | 2 +- 323 files changed, 1227 insertions(+), 1291 deletions(-) diff --git a/android_crop_lib/src/main/res/values/styles.xml b/android_crop_lib/src/main/res/values/styles.xml index 5b161c8f0..7c3f45469 100644 --- a/android_crop_lib/src/main/res/values/styles.xml +++ b/android_crop_lib/src/main/res/values/styles.xml @@ -24,7 +24,7 @@ wrap_content center center_vertical - 20dp + 20dp 8dp @color/crop__button_text bold diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MagicTextView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MagicTextView.java index b31b7c4ca..ff3f3b401 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MagicTextView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MagicTextView.java @@ -21,6 +21,8 @@ import android.util.AttributeSet; import android.util.Pair; import android.widget.TextView; +import androidx.appcompat.widget.AppCompatTextView; + import com.yizhuan.erban.R; import java.util.ArrayList; @@ -38,7 +40,7 @@ import java.util.WeakHashMap; * AuthorPhone：nothing * Created by 2016/9/22. */ -public class MagicTextView extends TextView { +public class MagicTextView extends AppCompatTextView { private ArrayList outerShadows; private ArrayList innerShadows; diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java index dd1524567..b0731281e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java @@ -53,7 +53,7 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene //hint透明度 private int alpha; - private int paddingLeft; + private int paddingStart; private int paddingTop; private int paddingRight; private int paddingBottom; @@ -113,7 +113,7 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene delay = type.getInt(R.styleable.RollViewPager_rollviewpager_play_delay, 0); color = type.getColor(R.styleable.RollViewPager_rollviewpager_hint_color, Color.BLACK); alpha = type.getInt(R.styleable.RollViewPager_rollviewpager_hint_alpha, 0); - paddingLeft = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingLeft, 0); + paddingStart = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingStart, 0); paddingRight = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingRight, 0); paddingTop = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingTop, 0); paddingBottom = (int) type.getDimension(R.styleable.RollViewPager_rollviewpager_hint_paddingBottom, Util.dip2px(getContext(), 4)); @@ -231,7 +231,7 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene */ private void loadHintView() { addView(mHintView); - mHintView.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom); + mHintView.setPadding(paddingStart, paddingTop, paddingRight, paddingBottom); LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); lp.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); ((View) mHintView).setLayoutParams(lp); @@ -319,11 +319,11 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene * 设置提示view的位置 */ public void setHintPadding(int left, int top, int right, int bottom) { - paddingLeft = left; + paddingStart = left; paddingTop = top; paddingRight = right; paddingBottom = bottom; - mHintView.setPadding(paddingLeft, paddingTop, paddingRight, paddingBottom); + mHintView.setPadding(paddingStart, paddingTop, paddingRight, paddingBottom); } /** 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 82a643c75..07e8ae9e8 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"> + android:layout_marginStart="50dp" + android:layout_marginEnd="50dp"> diff --git a/app/src/main/res/layout/activity_binder_alipay.xml b/app/src/main/res/layout/activity_binder_alipay.xml index 4c8fb482e..dcc0c654f 100644 --- a/app/src/main/res/layout/activity_binder_alipay.xml +++ b/app/src/main/res/layout/activity_binder_alipay.xml @@ -18,8 +18,8 @@ android:background="@color/bg_secondary_2a2a39" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingLeft="32dp" - android:paddingRight="32dp"> + android:paddingStart="32dp" + android:paddingEnd="32dp"> + android:paddingStart="32dp" + android:paddingEnd="32dp"> + android:paddingStart="32dp" + android:paddingEnd="32dp"> @@ -164,9 +164,9 @@ android:id="@+id/btn_binder" android:layout_width="match_parent" android:layout_height="40dp" - android:layout_marginLeft="32dp" + android:layout_marginStart="32dp" android:layout_marginTop="30dp" - android:layout_marginRight="32dp" + android:layout_marginEnd="32dp" android:background="@drawable/selector_common_confirm" android:clickable="true" android:text="@string/layout_activity_binder_alipay_08" @@ -177,9 +177,9 @@ android:id="@+id/btn_binder_request" android:layout_width="match_parent" android:layout_height="40dp" - android:layout_marginLeft="32dp" + android:layout_marginStart="32dp" android:layout_marginTop="30dp" - android:layout_marginRight="32dp" + android:layout_marginEnd="32dp" android:background="@drawable/selector_common_confirm" android:clickable="true" android:text="@string/layout_activity_binder_alipay_09" 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 2b3d0041f..db7222b27 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 4f860c5f9..dc0753e8c 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 cb2042455..654bdc096 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="@dimen/sp_11" /> @@ -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="@dimen/sp_11" /> @@ -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="@dimen/sp_11" /> @@ -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="@dimen/sp_11" /> @@ -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="@dimen/sp_11" /> @@ -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="@dimen/sp_11" /> @@ -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="@dimen/sp_11" /> @@ -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"> @@ -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/selector_common_confirm" 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/selector_common_confirm" 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/bg_common_cancel_30" 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 f6be8709f..4a46efefd 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_exchange_gold.xml b/app/src/main/res/layout/activity_exchange_gold.xml index f886e09f8..26ad58882 100644 --- a/app/src/main/res/layout/activity_exchange_gold.xml +++ b/app/src/main/res/layout/activity_exchange_gold.xml @@ -16,8 +16,8 @@ android:layout_height="44dp" android:background="#FFF8F5" android:gravity="center_vertical" - android:paddingLeft="15dp" - android:paddingRight="25dp"> + android:paddingStart="15dp" + android:paddingEnd="25dp"> + android:paddingStart="15dp" + android:paddingEnd="25dp"> @@ -102,7 +102,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:layout_toRightOf="@id/jew_exchange_number_img" android:background="@null" android:hint="@string/layout_activity_exchange_gold_03" @@ -142,9 +142,9 @@ android:id="@+id/gold_exchange_number_img" android:layout_width="18dp" android:layout_height="18dp" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_marginRight="30dp" + android:layout_marginEnd="30dp" android:src="@drawable/icon_exchange_gold" android:visibility="gone" /> @@ -152,9 +152,9 @@ android:id="@+id/gold_exchange_number" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:textColor="@color/text_tertiary" android:textSize="@dimen/font_medium" tools:text="@string/layout_activity_exchange_gold_05" /> @@ -176,9 +176,9 @@ android:id="@+id/tv_hammar_exchange_number" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:textColor="@color/text_tertiary" android:textSize="@dimen/font_medium" tools:text="@string/layout_activity_exchange_gold_06" /> @@ -197,9 +197,9 @@ style="?android:attr/borderlessButtonStyle" android:layout_width="match_parent" android:layout_height="40dp" - android:layout_marginLeft="63dp" + android:layout_marginStart="63dp" android:layout_marginTop="25dp" - android:layout_marginRight="63dp" + android:layout_marginEnd="63dp" android:background="@drawable/shape_semi_round_grey_e5_solid" android:enabled="false" android:text="@string/layout_activity_exchange_gold_07" diff --git a/app/src/main/res/layout/activity_family_home.xml b/app/src/main/res/layout/activity_family_home.xml index 773897ee0..976e6244a 100644 --- a/app/src/main/res/layout/activity_family_home.xml +++ b/app/src/main/res/layout/activity_family_home.xml @@ -121,8 +121,8 @@ android:background="@color/color_white" 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:paddingStart="@dimen/dp_15" + android:paddingEnd="@dimen/dp_15"> @@ -280,16 +280,16 @@ @@ -346,16 +346,16 @@ diff --git a/app/src/main/res/layout/activity_family_info.xml b/app/src/main/res/layout/activity_family_info.xml index fe57848f7..8c4e46d72 100644 --- a/app/src/main/res/layout/activity_family_info.xml +++ b/app/src/main/res/layout/activity_family_info.xml @@ -22,8 +22,8 @@ android:background="@color/color_white" 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"> @@ -62,8 +62,8 @@ android:background="@color/color_white" 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:paddingStart="@dimen/dp_15" + android:paddingEnd="@dimen/dp_15"> + android:layout_marginEnd="6dp" /> @@ -134,8 +134,8 @@ android:id="@+id/tv_family_disband" 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:layout_marginBottom="@dimen/dp_20" android:background="@drawable/shape_white_20dp_round" android:gravity="center" diff --git a/app/src/main/res/layout/activity_family_list_member.xml b/app/src/main/res/layout/activity_family_list_member.xml index bf99adad5..59a9724c7 100644 --- a/app/src/main/res/layout/activity_family_list_member.xml +++ b/app/src/main/res/layout/activity_family_list_member.xml @@ -28,8 +28,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"> @@ -37,13 +37,13 @@ @@ -73,7 +73,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:gravity="center" - 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_family_plaza.xml b/app/src/main/res/layout/activity_family_plaza.xml index 576022a5e..593efb130 100644 --- a/app/src/main/res/layout/activity_family_plaza.xml +++ b/app/src/main/res/layout/activity_family_plaza.xml @@ -58,8 +58,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="14dp" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:layout_marginTop="14dp" android:text="@string/family_weekly_rank_board" android:textColor="@color/color_1A1A1A" diff --git a/app/src/main/res/layout/activity_family_search.xml b/app/src/main/res/layout/activity_family_search.xml index 0341f3280..9a7bd812a 100644 --- a/app/src/main/res/layout/activity_family_search.xml +++ b/app/src/main/res/layout/activity_family_search.xml @@ -27,7 +27,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" @@ -37,14 +37,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" /> @@ -75,7 +75,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:gravity="center" - 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_fans.xml b/app/src/main/res/layout/activity_fans.xml index 4a4ef3e1b..09385343c 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 85bf13112..7a7455612 100644 --- a/app/src/main/res/layout/activity_feedback.xml +++ b/app/src/main/res/layout/activity_feedback.xml @@ -24,7 +24,7 @@ android:drawableLeft="@drawable/feedback_point" android:drawablePadding="4dp" android:gravity="center_vertical" - android:paddingLeft="15dp" + android:paddingStart="15dp" android:text="@string/layout_activity_feedback_01" android:textColor="@color/text_title_color" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/activity_granted_permissions.xml b/app/src/main/res/layout/activity_granted_permissions.xml index e17e46b98..d86e5c9c0 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 58daba1ec..f669c55e5 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 e2bcd32ca..2562c955f 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 e8dd523d1..0305bc54b 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 4e3f5ad2b..31e927fdc 100644 --- a/app/src/main/res/layout/activity_my_voice.xml +++ b/app/src/main/res/layout/activity_my_voice.xml @@ -22,9 +22,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 607fd289c..16d347ef5 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 ef3558ba6..d0bff2926 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" /> @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:src="@drawable/btn_close" /> @@ -57,8 +57,8 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_marginBottom="5dp" - android:layout_marginLeft="9dp" - android:layout_marginRight="5dp" + android:layout_marginStart="9dp" + android:layout_marginEnd="5dp" android:layout_marginTop="5dp" android:layout_weight="1" android:gravity="top" diff --git a/app/src/main/res/layout/activity_patriarch_mode.xml b/app/src/main/res/layout/activity_patriarch_mode.xml index 88c735911..cbd5c06f3 100644 --- a/app/src/main/res/layout/activity_patriarch_mode.xml +++ b/app/src/main/res/layout/activity_patriarch_mode.xml @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:drawableStart="@drawable/shape_pm_point" android:drawablePadding="10dp" - android:paddingRight="28dp" + android:paddingEnd="28dp" android:text="@string/layout_activity_patriarch_mode_02" android:textColor="@color/text_normal_c6c6e9" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/activity_recyclerview_bind.xml b/app/src/main/res/layout/activity_recyclerview_bind.xml index aacbe1361..102bfd2f5 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 eb1669525..e418b03ff 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" /> @@ -248,9 +248,9 @@ @@ -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" /> @@ -279,9 +279,9 @@ @@ -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" /> @@ -310,9 +310,9 @@ @@ -334,9 +334,9 @@ android:id="@+id/switch_audio" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="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 cb9ee7fcb..865534d02 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_setting.xml b/app/src/main/res/layout/activity_setting.xml index f5a658c68..2a8a28ff4 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -181,8 +181,8 @@ android:layout_width="match_parent" android:layout_height="50dp" android:gravity="center_vertical" - android:paddingLeft="@dimen/dp_15" - android:paddingRight="@dimen/dp_15" + android:paddingStart="@dimen/dp_15" + android:paddingEnd="@dimen/dp_15" android:text="@string/text_setting_black_management" android:textColor="@color/text_title_color" android:textSize="14sp" @@ -265,8 +265,8 @@ android:layout_width="match_parent" android:layout_height="50dp" android:gravity="center_vertical" - android:paddingLeft="@dimen/dp_15" - android:paddingRight="@dimen/dp_15" + android:paddingStart="@dimen/dp_15" + android:paddingEnd="@dimen/dp_15" android:text="@string/text_setting_community_norms" android:textColor="@color/text_title_color" android:textSize="14sp" diff --git a/app/src/main/res/layout/activity_skill_edit.xml b/app/src/main/res/layout/activity_skill_edit.xml index 6d1f56619..9d82e96bc 100644 --- a/app/src/main/res/layout/activity_skill_edit.xml +++ b/app/src/main/res/layout/activity_skill_edit.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:layout_marginLeft="@dimen/dp_15" + android:layout_marginStart="@dimen/dp_15" android:layout_margin="@dimen/dp_15" android:background="@drawable/shape_white_alpha_10" app:layout_constraintTop_toBottomOf="@id/title_bar" /> diff --git a/app/src/main/res/layout/activity_skill_home.xml b/app/src/main/res/layout/activity_skill_home.xml index 50a8c3c48..b55abb7d2 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 305e6d7c4..fe44e0163 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"> @@ -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 f363d2ebb..e754f3bce 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.xml b/app/src/main/res/layout/activity_user_info.xml index 746eb27bf..3a2f8271b 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -469,8 +469,8 @@ + android:paddingStart="15dp" + android:paddingEnd="15dp"> + android:paddingStart="15dp" + android:paddingEnd="15dp"> diff --git a/app/src/main/res/layout/activity_withdraw.xml b/app/src/main/res/layout/activity_withdraw.xml index d6b61bbc5..25c0e924e 100644 --- a/app/src/main/res/layout/activity_withdraw.xml +++ b/app/src/main/res/layout/activity_withdraw.xml @@ -26,14 +26,14 @@ android:layout_width="42dp" android:layout_height="42dp" android:layout_gravity="center_vertical" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:background="@drawable/icon_zhifubao_grey" /> @@ -61,7 +61,7 @@ android:layout_width="42dp" android:layout_height="42dp" android:layout_centerVertical="true" - android:layout_marginLeft="15dp" + android:layout_marginStart="15dp" android:background="@drawable/icon_zhifubao" /> @@ -87,7 +87,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/lly_zhifubao_user" - android:layout_marginLeft="10dp" + android:layout_marginStart="10dp" android:layout_marginTop="2dp" android:layout_toRightOf="@+id/zhifubao" android:orientation="horizontal" @@ -106,9 +106,9 @@ @@ -227,7 +227,7 @@ android:id="@+id/tv_tip" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="21dp" + android:layout_marginStart="21dp" android:layout_marginBottom="@dimen/dp_22" android:layout_marginTop="@dimen/dp_20" android:text="@string/withdraw_notice" /> @@ -246,8 +246,8 @@ android:layout_width="match_parent" android:layout_height="40dp" android:layout_centerInParent="true" - android:layout_marginLeft="@dimen/common_item_view_margin_left_right" - android:layout_marginRight="@dimen/common_item_view_margin_left_right" + android:layout_marginStart="@dimen/common_item_view_margin_left_right" + android:layout_marginEnd="@dimen/common_item_view_margin_left_right" android:background="@drawable/shape_semi_round_gray_un_solid" android:text="@string/layout_activity_withdraw_06" android:textColor="@color/white" @@ -258,8 +258,8 @@ android:layout_width="match_parent" android:layout_height="40dp" android:layout_centerInParent="true" - android:layout_marginLeft="@dimen/common_item_view_margin_left_right" - android:layout_marginRight="@dimen/common_item_view_margin_left_right" + android:layout_marginStart="@dimen/common_item_view_margin_left_right" + android:layout_marginEnd="@dimen/common_item_view_margin_left_right" android:background="@drawable/shape_semi_round_yellow_solid" android:text="@string/layout_activity_withdraw_07" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_withdraw_bills.xml b/app/src/main/res/layout/activity_withdraw_bills.xml index ca8f604b3..8b54be911 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" /> @@ -50,10 +50,10 @@ android:id="@+id/tv_selector_date" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="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" /> @@ -71,9 +71,9 @@ android:id="@+id/iv_goto_top" android:layout_width="50dp" android:layout_height="50dp" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="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..5071bf5da 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..8cecd560b 100644 --- a/app/src/main/res/layout/dialog_bottom_auction_plus.xml +++ b/app/src/main/res/layout/dialog_bottom_auction_plus.xml @@ -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" /> @@ -202,8 +202,8 @@ android:background="@drawable/shape_semi_round_white_solid_black_stroke" android:drawableRight="@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">