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 3995011db..731d6dd2e 100644 --- a/app/src/main/res/layout/activity_add_team_member.xml +++ b/app/src/main/res/layout/activity_add_team_member.xml @@ -100,6 +100,7 @@ diff --git a/app/src/main/res/layout/activity_add_team_member_search_list.xml b/app/src/main/res/layout/activity_add_team_member_search_list.xml index 69417da55..84808eccd 100644 --- a/app/src/main/res/layout/activity_add_team_member_search_list.xml +++ b/app/src/main/res/layout/activity_add_team_member_search_list.xml @@ -94,6 +94,7 @@ diff --git a/app/src/main/res/layout/activity_bills.xml b/app/src/main/res/layout/activity_bills.xml index cd22be11d..c8e175896 100644 --- a/app/src/main/res/layout/activity_bills.xml +++ b/app/src/main/res/layout/activity_bills.xml @@ -60,6 +60,7 @@ diff --git a/app/src/main/res/layout/activity_erban_top_message.xml b/app/src/main/res/layout/activity_erban_top_message.xml index 8c5d5fc8d..19502bbdb 100644 --- a/app/src/main/res/layout/activity_erban_top_message.xml +++ b/app/src/main/res/layout/activity_erban_top_message.xml @@ -14,6 +14,7 @@ diff --git a/app/src/main/res/layout/activity_family_game_list.xml b/app/src/main/res/layout/activity_family_game_list.xml index 07737aa4a..14ec110d6 100644 --- a/app/src/main/res/layout/activity_family_game_list.xml +++ b/app/src/main/res/layout/activity_family_game_list.xml @@ -14,8 +14,10 @@ android:layout_height="wrap_content" /> + diff --git a/app/src/main/res/layout/activity_family_list.xml b/app/src/main/res/layout/activity_family_list.xml index f51e0ff77..c0aa8225d 100644 --- a/app/src/main/res/layout/activity_family_list.xml +++ b/app/src/main/res/layout/activity_family_list.xml @@ -13,6 +13,7 @@ android:layout_height="wrap_content" /> 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 7c4837fee..042c56ccb 100644 --- a/app/src/main/res/layout/activity_family_list_member.xml +++ b/app/src/main/res/layout/activity_family_list_member.xml @@ -90,6 +90,7 @@ diff --git a/app/src/main/res/layout/activity_family_member_search.xml b/app/src/main/res/layout/activity_family_member_search.xml index 4452baa71..140f62a05 100644 --- a/app/src/main/res/layout/activity_family_member_search.xml +++ b/app/src/main/res/layout/activity_family_member_search.xml @@ -81,6 +81,7 @@ diff --git a/app/src/main/res/layout/activity_family_search.xml b/app/src/main/res/layout/activity_family_search.xml index bafb12483..75614913f 100644 --- a/app/src/main/res/layout/activity_family_search.xml +++ b/app/src/main/res/layout/activity_family_search.xml @@ -84,6 +84,7 @@ diff --git a/app/src/main/res/layout/activity_friend_black_list_manage.xml b/app/src/main/res/layout/activity_friend_black_list_manage.xml index 5701fc4af..d40fae39d 100644 --- a/app/src/main/res/layout/activity_friend_black_list_manage.xml +++ b/app/src/main/res/layout/activity_friend_black_list_manage.xml @@ -13,6 +13,7 @@ android:layout_marginTop="@dimen/dp_30" /> diff --git a/app/src/main/res/layout/activity_list_attention.xml b/app/src/main/res/layout/activity_list_attention.xml index f123a7f09..8be0ef373 100644 --- a/app/src/main/res/layout/activity_list_attention.xml +++ b/app/src/main/res/layout/activity_list_attention.xml @@ -16,6 +16,7 @@ android:layout_height="8dp" /> 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 62a63a2a2..03df0afa5 100644 --- a/app/src/main/res/layout/activity_new_user_list.xml +++ b/app/src/main/res/layout/activity_new_user_list.xml @@ -13,6 +13,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_record_for_pk.xml b/app/src/main/res/layout/activity_record_for_pk.xml index 9833be77b..2f5db4b02 100644 --- a/app/src/main/res/layout/activity_record_for_pk.xml +++ b/app/src/main/res/layout/activity_record_for_pk.xml @@ -12,6 +12,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_room_black_list.xml b/app/src/main/res/layout/activity_room_black_list.xml index 523d4c817..843c14caf 100644 --- a/app/src/main/res/layout/activity_room_black_list.xml +++ b/app/src/main/res/layout/activity_room_black_list.xml @@ -12,6 +12,7 @@ android:layout_marginTop="@dimen/dp_30" /> diff --git a/app/src/main/res/layout/activity_room_invite.xml b/app/src/main/res/layout/activity_room_invite.xml index fc67ae4b3..e2d6ef324 100644 --- a/app/src/main/res/layout/activity_room_invite.xml +++ b/app/src/main/res/layout/activity_room_invite.xml @@ -13,6 +13,7 @@ android:layout_marginTop="@dimen/dp_30" /> diff --git a/app/src/main/res/layout/activity_room_manager_list.xml b/app/src/main/res/layout/activity_room_manager_list.xml index a647ccbb9..ed157d511 100644 --- a/app/src/main/res/layout/activity_room_manager_list.xml +++ b/app/src/main/res/layout/activity_room_manager_list.xml @@ -12,6 +12,7 @@ android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_search_hall.xml b/app/src/main/res/layout/activity_search_hall.xml index 06d602cc9..cb941fd7f 100644 --- a/app/src/main/res/layout/activity_search_hall.xml +++ b/app/src/main/res/layout/activity_search_hall.xml @@ -102,6 +102,7 @@ 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 b28ee43a0..8d213bb4a 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 @@ -95,6 +95,7 @@ diff --git a/app/src/main/res/layout/activity_team_weekly_bill.xml b/app/src/main/res/layout/activity_team_weekly_bill.xml index e4efbcf65..ce863afc9 100644 --- a/app/src/main/res/layout/activity_team_weekly_bill.xml +++ b/app/src/main/res/layout/activity_team_weekly_bill.xml @@ -22,6 +22,7 @@ android:layout_height="wrap_content" /> 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 31250c946..9b6ff9e4a 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 @@ -95,6 +95,7 @@ diff --git a/app/src/main/res/layout/fragment_family_attention.xml b/app/src/main/res/layout/fragment_family_attention.xml index f6aafc80a..bdc28c8f3 100644 --- a/app/src/main/res/layout/fragment_family_attention.xml +++ b/app/src/main/res/layout/fragment_family_attention.xml @@ -2,10 +2,12 @@ + + android:layout_height="match_parent" + android:background="@color/color_F5F5F5"> + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/fragment_family_fans_list.xml b/app/src/main/res/layout/fragment_family_fans_list.xml index 1ac13d371..5da55de59 100644 --- a/app/src/main/res/layout/fragment_family_fans_list.xml +++ b/app/src/main/res/layout/fragment_family_fans_list.xml @@ -5,7 +5,8 @@ android:orientation="vertical"> - diff --git a/app/src/main/res/layout/fragment_family_friend_list.xml b/app/src/main/res/layout/fragment_family_friend_list.xml index 9a901e4cd..f12a4b61e 100644 --- a/app/src/main/res/layout/fragment_family_friend_list.xml +++ b/app/src/main/res/layout/fragment_family_friend_list.xml @@ -1,6 +1,6 @@ - diff --git a/app/src/main/res/layout/fragment_fans_list.xml b/app/src/main/res/layout/fragment_fans_list.xml index a7e8f9a43..a0fb58370 100644 --- a/app/src/main/res/layout/fragment_fans_list.xml +++ b/app/src/main/res/layout/fragment_fans_list.xml @@ -1,8 +1,8 @@ + android:layout_height="match_parent"> - diff --git a/app/src/main/res/layout/fragment_home_tab_map.xml b/app/src/main/res/layout/fragment_home_tab_map.xml index ef302cef7..eff6853af 100644 --- a/app/src/main/res/layout/fragment_home_tab_map.xml +++ b/app/src/main/res/layout/fragment_home_tab_map.xml @@ -1,5 +1,6 @@ diff --git a/app/src/main/res/layout/fragment_my_car.xml b/app/src/main/res/layout/fragment_my_car.xml index 6978233c8..8563525ac 100644 --- a/app/src/main/res/layout/fragment_my_car.xml +++ b/app/src/main/res/layout/fragment_my_car.xml @@ -7,6 +7,7 @@ diff --git a/app/src/main/res/layout/fragment_my_chat_bubble.xml b/app/src/main/res/layout/fragment_my_chat_bubble.xml index 7c64b956b..07f5c69c6 100644 --- a/app/src/main/res/layout/fragment_my_chat_bubble.xml +++ b/app/src/main/res/layout/fragment_my_chat_bubble.xml @@ -9,6 +9,7 @@ diff --git a/app/src/main/res/layout/fragment_newbie_list.xml b/app/src/main/res/layout/fragment_newbie_list.xml index 7bcb630c1..281212877 100644 --- a/app/src/main/res/layout/fragment_newbie_list.xml +++ b/app/src/main/res/layout/fragment_newbie_list.xml @@ -1,20 +1,19 @@ + android:layout_height="match_parent"> + android:paddingTop="2dp" /> diff --git a/app/src/main/res/layout/fragment_newbie_message.xml b/app/src/main/res/layout/fragment_newbie_message.xml index 2c08a8fa0..38d11f725 100644 --- a/app/src/main/res/layout/fragment_newbie_message.xml +++ b/app/src/main/res/layout/fragment_newbie_message.xml @@ -1,5 +1,6 @@ diff --git a/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml b/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml index 3b9b537e8..e0d18a027 100644 --- a/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml +++ b/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml @@ -10,6 +10,7 @@ @@ -37,13 +38,15 @@ android:id="@+id/ll_empty_content" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:gravity="center" + android:orientation="vertical" android:visibility="gone"> + + android:src="@drawable/icon_prize_box_empty" /> + diff --git a/app/src/main/res/layout/fragment_room_list.xml b/app/src/main/res/layout/fragment_room_list.xml index c4bf73411..d0f4c4e0d 100644 --- a/app/src/main/res/layout/fragment_room_list.xml +++ b/app/src/main/res/layout/fragment_room_list.xml @@ -1,5 +1,6 @@ @@ -12,9 +13,9 @@ + android:background="@color/white" + android:clipToPadding="false" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search_detail.xml b/app/src/main/res/layout/fragment_search_detail.xml index 0f33d6e55..96379e6e4 100644 --- a/app/src/main/res/layout/fragment_search_detail.xml +++ b/app/src/main/res/layout/fragment_search_detail.xml @@ -1,13 +1,12 @@ + android:layout_height="match_parent"> - + android:layout_height="match_parent"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_task_center.xml b/app/src/main/res/layout/fragment_task_center.xml index 59a2a0317..60e874315 100644 --- a/app/src/main/res/layout/fragment_task_center.xml +++ b/app/src/main/res/layout/fragment_task_center.xml @@ -1,10 +1,10 @@ - @@ -15,9 +15,9 @@ + android:layout_height="match_parent" + android:overScrollMode="never" /> diff --git a/app/src/main/res/layout/fragment_team_list.xml b/app/src/main/res/layout/fragment_team_list.xml index f43d30b86..887fc5804 100644 --- a/app/src/main/res/layout/fragment_team_list.xml +++ b/app/src/main/res/layout/fragment_team_list.xml @@ -9,6 +9,7 @@ diff --git a/app/src/main/res/layout/fragment_xrexylerview.xml b/app/src/main/res/layout/fragment_xrexylerview.xml index 94e48d8dd..5a2158fe7 100644 --- a/app/src/main/res/layout/fragment_xrexylerview.xml +++ b/app/src/main/res/layout/fragment_xrexylerview.xml @@ -6,6 +6,7 @@ diff --git a/app/src/main/res/layout/frg_my_decoration_common.xml b/app/src/main/res/layout/frg_my_decoration_common.xml index 46d0ffbe3..70bc3e8fc 100644 --- a/app/src/main/res/layout/frg_my_decoration_common.xml +++ b/app/src/main/res/layout/frg_my_decoration_common.xml @@ -7,6 +7,7 @@ diff --git a/app/src/module_community/res/layout/activity_publish.xml b/app/src/module_community/res/layout/activity_publish.xml index c6b36deb4..410f56e57 100644 --- a/app/src/module_community/res/layout/activity_publish.xml +++ b/app/src/module_community/res/layout/activity_publish.xml @@ -134,7 +134,7 @@ android:gravity="center" android:paddingStart="@dimen/dp_10" android:paddingEnd="@dimen/dp_10" - android:textColor="@color/white" + android:textColor="@color/text_normal_282828" android:textSize="@dimen/sp_12" tools:text="话题名称" /> diff --git a/app/src/module_labour_union/res/layout/activity_add_member.xml b/app/src/module_labour_union/res/layout/activity_add_member.xml index a1178354d..e53fc0dc1 100644 --- a/app/src/module_labour_union/res/layout/activity_add_member.xml +++ b/app/src/module_labour_union/res/layout/activity_add_member.xml @@ -2,8 +2,8 @@ + android:background="@color/bg_normal_1c1b22" + android:orientation="vertical"> + android:paddingEnd="8dp" + android:src="@drawable/arrow_left" /> + android:layout_marginStart="29dp" + android:layout_marginEnd="29dp" + android:background="@null" + android:hint="搜索用户昵称/ID" + android:textColor="@color/text_normal_282828" + android:textColorHint="@color/text_hint_555574" + android:textSize="@dimen/sp_13" /> @@ -52,20 +52,20 @@ android:id="@+id/tv_search" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_title_282828" android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:layout_marginEnd="15dp" - android:textSize="16dp" - android:text="@string/search" /> + android:text="@string/search" + android:textColor="@color/text_title_282828" + android:textSize="16dp" /> + android:layout_height="match_parent" + android:layout_marginTop="8dp"> diff --git a/app/src/module_mini_world/res/layout/activity_mini_world.xml b/app/src/module_mini_world/res/layout/activity_mini_world.xml index 939be9e95..1c2b6ae26 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world.xml @@ -14,9 +14,10 @@ android:layout_height="wrap_content" /> + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:layout_below="@+id/magic_indicator" /> diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_main.xml b/app/src/module_mini_world/res/layout/activity_mini_world_main.xml index 9a5039295..1a5172ee1 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world_main.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world_main.xml @@ -74,6 +74,7 @@ android:layout_height="match_parent"> diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_search.xml b/app/src/module_mini_world/res/layout/activity_mini_world_search.xml index 60706ffde..54fb83795 100644 --- a/app/src/module_mini_world/res/layout/activity_mini_world_search.xml +++ b/app/src/module_mini_world/res/layout/activity_mini_world_search.xml @@ -81,6 +81,7 @@ diff --git a/app/src/module_mini_world/res/layout/activity_topic_main.xml b/app/src/module_mini_world/res/layout/activity_topic_main.xml index d22d35ea1..dbe577252 100644 --- a/app/src/module_mini_world/res/layout/activity_topic_main.xml +++ b/app/src/module_mini_world/res/layout/activity_topic_main.xml @@ -72,10 +72,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:drawableStart="@mipmap/ic_camera" android:drawablePadding="@dimen/dp_9" android:text="@string/join_topic" - android:textColor="@color/white" + android:textColor="@color/text_normal_282828" android:textSize="@dimen/sp_15" tools:ignore="ContentDescription" /> diff --git a/app/src/module_mini_world/res/layout/fragment_mini_world_category.xml b/app/src/module_mini_world/res/layout/fragment_mini_world_category.xml index e493ce27b..ad10cb18a 100644 --- a/app/src/module_mini_world/res/layout/fragment_mini_world_category.xml +++ b/app/src/module_mini_world/res/layout/fragment_mini_world_category.xml @@ -1,5 +1,6 @@ diff --git a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml index 492b01247..12fe638d2 100644 --- a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml +++ b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml @@ -87,6 +87,7 @@ diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml index 89a18ce79..f12a4b61e 100644 --- a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml +++ b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml @@ -1,5 +1,6 @@ diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message_view.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message_view.xml index d27950b71..04379e4e9 100644 --- a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message_view.xml +++ b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message_view.xml @@ -4,6 +4,7 @@ android:layout_height="match_parent">