yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI修改:房间私聊消息相关

Browse Source
This commit is contained in:
huangjian
2021-03-31 18:34:20 +08:00
parent 1d9d53e9d9
commit 3a143c4f53
19 changed files with 109 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/common/res/drawable/bg_common_touch.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/bg_secondary_2a2a39" android:state_pressed="true" />
<item android:drawable="@color/bg_secondary_2a2a39" android:state_focused="true" />
<item android:drawable="@color/bg_normal_1c1b22" />
</selector>

5
app/src/main/res/layout/fragment_network_error.xml
View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="@color/white">
<ImageView <ImageView
android:id="@+id/in_big_top_board" android:id="@+id/in_big_top_board"
@@ -29,7 +28,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:text="@string/network_error_reload" android:text="@string/network_error_reload"
android:textColor="@color/text_tertiary" android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/font_medium" /> android:textSize="@dimen/font_medium" />
</LinearLayout> </LinearLayout>

2
app/src/main/res/layout/newbie_list_item.xml
View File

@@ -113,7 +113,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
android:background="@drawable/shape_bg_add_attention" android:background="@drawable/bg_common_confirm"
android:gravity="center" android:gravity="center"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:text="@string/say_hello" android:text="@string/say_hello"

15
app/src/main/res/layout/newbie_message_item.xml
View File

@@ -1,21 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root_view"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="34dp" android:orientation="horizontal"
android:id="@+id/root_view" android:paddingBottom="34dp">
android:orientation="horizontal">
<RadioButton <RadioButton
android:id="@+id/rb_message" android:id="@+id/rb_message"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:button="@drawable/selector_check_box_pic_check"
android:layout_marginStart="@dimen/dp_15" android:layout_marginStart="@dimen/dp_15"
android:clickable="false" android:button="@drawable/selector_check_box_pic_check"
/> android:clickable="false" />
<TextView <TextView
android:id="@+id/tv_message" android:id="@+id/tv_message"
@@ -23,5 +20,5 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10" android:layout_marginStart="@dimen/dp_10"
android:text="哈哈哈哈" android:text="哈哈哈哈"
/> android:textColor="@color/text_normal_c6c6e9" />
</LinearLayout> </LinearLayout>

12
app/src/main/res/layout/nim_recent_contact_list_item.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="65dp" android:layout_height="65dp"
android:background="@drawable/bg_common_touch_while"> android:background="@drawable/bg_common_touch">
<View <View
android:id="@+id/top_line" android:id="@+id/top_line"
@@ -11,7 +11,7 @@
android:layout_height="1px" android:layout_height="1px"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginStart="70dip" android:layout_marginStart="70dip"
android:background="@color/color_gray_d9d9d9" /> android:background="@color/line_353548" />
<RelativeLayout <RelativeLayout
android:id="@+id/rl_user_avatar" android:id="@+id/rl_user_avatar"
@@ -109,7 +109,7 @@
android:maxWidth="130dp" android:maxWidth="130dp"
android:singleLine="true" android:singleLine="true"
android:text="" android:text=""
android:textColor="@color/color_black_333333" android:textColor="@color/text_title_white"
android:textSize="15dp" android:textSize="15dp"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="你好啊啊啊啊啊啊啊啊" /> tools:text="你好啊啊啊啊啊啊啊啊" />
@@ -139,7 +139,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:lines="1" android:lines="1"
android:text="" android:text=""
android:textColor="@color/color_grey_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp" android:textSize="13dp"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="我是内容" /> tools:text="我是内容" />
@@ -165,7 +165,7 @@
android:lines="1" android:lines="1"
android:scrollHorizontally="true" android:scrollHorizontally="true"
android:text="" android:text=""
android:textColor="@color/color_grey_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp" android:textSize="13dp"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" /> tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" />
@@ -181,7 +181,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="16dip" android:layout_marginTop="16dip"
android:layout_marginEnd="10dip" android:layout_marginEnd="10dip"
android:textColor="@color/color_grey_999999" android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/text_small_size_ten_sp" android:textSize="@dimen/text_small_size_ten_sp"
tools:text="just now" /> tools:text="just now" />

1
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieActivity.java
View File

@@ -56,7 +56,6 @@ public class RoomNewbieActivity extends BaseActivity {
@Override @Override
protected void setStatusBar() { protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this); StatusBarUtil.transparencyBar(this);
} }

16
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomNewbieMessageActivity.java
View File

@@ -10,6 +10,7 @@ import android.widget.TextView;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R; import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity; import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.tutu.room_chat.event.ChangeNewbieMessageEvent; import com.yizhuan.tutu.room_chat.event.ChangeNewbieMessageEvent;
@@ -44,11 +45,6 @@ public class RoomNewbieMessageActivity extends BaseActivity implements View.OnCl
fragmentTransaction.replace(R.id.recent_container, newbieMessageFragment).commitAllowingStateLoss(); fragmentTransaction.replace(R.id.recent_container, newbieMessageFragment).commitAllowingStateLoss();
} }
@Override
protected boolean needSteepStateBar() {
return false;
}
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -105,4 +101,14 @@ public class RoomNewbieMessageActivity extends BaseActivity implements View.OnCl
break; break;
} }
} }
@Override
protected boolean needSteepStateBar() {
return !mIsInRoom;
}
@Override
protected void setStatusBar() {
StatusBarUtil.transparencyBar(this);
}
} }

2
app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentViewHolder.java
View File

@@ -82,7 +82,7 @@ public abstract class RoomMsgRecentViewHolder extends RecyclerViewHolder<BaseQui
protected void updateBackground(BaseViewHolder holder, RecentContact recent, int position) { protected void updateBackground(BaseViewHolder holder, RecentContact recent, int position) {
if ((recent.getTag() & RecentContactsFragment.RECENT_TAG_STICKY) == 0) { if ((recent.getTag() & RecentContactsFragment.RECENT_TAG_STICKY) == 0) {
holder.getConvertView().setBackgroundResource(R.drawable.bg_common_touch_while); holder.getConvertView().setBackgroundResource(R.drawable.bg_common_touch);
} else { } else {
holder.getConvertView().setBackgroundResource(R.drawable.nim_recent_contact_sticky_selecter); holder.getConvertView().setBackgroundResource(R.drawable.nim_recent_contact_sticky_selecter);
} }

7
app/src/module_room_chat/res/drawable/shape_1c1b22_top_15dp.xml Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/bg_normal_1c1b22"/>
<corners android:topLeftRadius="@dimen/dp_15"
android:topRightRadius="@dimen/dp_15"/>
</shape>

12
app/src/module_room_chat/res/layout/activity_newbie_list.xml
View File

@@ -5,32 +5,33 @@
android:id="@+id/root_view" android:id="@+id/root_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="27dp" android:paddingTop="25dp"
android:background="@color/bg_normal_1c1b22"> android:background="@color/bg_normal_1c1b22">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:layout_gravity="center_vertical"
>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:text="@string/find_new" android:text="@string/find_new"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/dp_18" /> android:textSize="@dimen/dp_18" />
@@ -52,7 +53,6 @@
android:padding="@dimen/dp_8" android:padding="@dimen/dp_8"
android:src="@drawable/arrow_left_white" /> android:src="@drawable/arrow_left_white" />
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout

42
app/src/module_room_chat/res/layout/activity_newbie_message.xml
View File

@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_view" android:id="@+id/root_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:background="@color/color_666666"> android:background="@color/bg_normal_1c1b22">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/white" android:layout_marginTop="@dimen/dp_25"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
@@ -19,51 +17,47 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="@dimen/dp_15" android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_22" android:paddingBottom="@dimen/dp_22">
>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="请选择"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_18"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_15" android:layout_marginStart="@dimen/dp_15"
/> android:text="请选择"
android:textColor="@color/text_title_white"
android:textSize="@dimen/dp_18" />
<TextView <TextView
android:id="@+id/tv_refresh" android:id="@+id/tv_refresh"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="换一批"
android:drawableStart="@drawable/refresh"
android:drawablePadding="@dimen/dp_5"
android:textColor="@color/color_666666"
android:textSize="13sp"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
/> android:drawableStart="@drawable/refresh"
android:drawablePadding="@dimen/dp_5"
android:text="换一批"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout
android:id="@+id/recent_container" android:id="@+id/recent_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1" />
/>
<TextView <TextView
android:id="@+id/tv_send" android:id="@+id/tv_send"
android:layout_width="160dp" android:layout_width="160dp"
android:layout_height="@dimen/dp_38" android:layout_height="@dimen/dp_38"
android:text="发送"
android:gravity="center"
android:textSize="14sp"
android:textColor="@color/white"
android:background="@drawable/bg_common_confirm_normal"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_20"
/> android:background="@drawable/bg_common_confirm"
android:gravity="center"
android:text="发送"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
</LinearLayout> </LinearLayout>

7
app/src/module_room_chat/res/layout/activity_p2p_room_message.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/room_msg_height" android:layout_height="@dimen/room_msg_height"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@drawable/shape_white_top_14dp" android:background="@drawable/shape_1c1b22_top_15dp"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
@@ -22,7 +22,7 @@
android:layout_width="@dimen/dp_50" android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50" android:layout_height="@dimen/dp_50"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/icon_arrow_left_black" /> android:src="@drawable/arrow_left_white" />
<TextView <TextView
android:id="@+id/tv_toolbar_title" android:id="@+id/tv_toolbar_title"
@@ -33,7 +33,8 @@
android:maxWidth="214dp" android:maxWidth="214dp"
android:maxLines="1" android:maxLines="1"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/Toolbar.TitleText" android:textSize="@dimen/sp_16"
android:textColor="@color/text_title_white"
android:visibility="gone" android:visibility="gone"
tools:text="孙行者123" tools:text="孙行者123"
tools:visibility="visible" /> tools:visibility="visible" />

16
app/src/module_room_chat/res/layout/activity_room_invite_fans.xml
View File

@@ -11,7 +11,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="273dp" android:layout_height="273dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@drawable/shape_white_top_14dp" android:background="@drawable/shape_1c1b22_top_15dp"
android:orientation="vertical"> android:orientation="vertical">
@@ -20,7 +20,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="@dimen/dp_16" android:textSize="@dimen/dp_16"
android:text="邀请房间粉丝" android:text="邀请房间粉丝"
android:textColor="@color/color_black_333333" android:textColor="@color/text_title_white"
android:textStyle="bold" android:textStyle="bold"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20"
@@ -36,7 +36,7 @@
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:layout_marginEnd="30dp" android:layout_marginEnd="30dp"
android:textColor="@color/color_666666" android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_12" android:textSize="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_25" android:layout_marginTop="@dimen/dp_25"
/> />
@@ -48,7 +48,7 @@
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:layout_marginEnd="30dp" android:layout_marginEnd="30dp"
android:textColor="@color/color_666666" android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_12" android:textSize="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_14" android:layout_marginTop="@dimen/dp_14"
/> />
@@ -60,7 +60,7 @@
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:layout_marginEnd="30dp" android:layout_marginEnd="30dp"
android:textColor="@color/color_666666" android:textColor="@color/text_normal_c6c6e9"
android:layout_marginTop="@dimen/dp_14" android:layout_marginTop="@dimen/dp_14"
android:textSize="@dimen/dp_12" android:textSize="@dimen/dp_12"
/> />
@@ -70,8 +70,8 @@
android:id="@+id/tv_invite_fans_confirm" android:id="@+id/tv_invite_fans_confirm"
android:layout_width="160dp" android:layout_width="160dp"
android:layout_height="38dp" android:layout_height="38dp"
android:background="@drawable/bg_common_confirm_normal" android:background="@drawable/bg_common_confirm"
android:textColor="@color/white" android:textColor="@color/text_title_white"
android:gravity="center" android:gravity="center"
android:layout_marginTop="@dimen/dp_35" android:layout_marginTop="@dimen/dp_35"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
@@ -84,7 +84,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" android:text=""
android:textSize="13dp" android:textSize="13dp"
android:textColor="@color/color_666666" android:textColor="@color/text_normal_c6c6e9"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16"
/> />

11
app/src/module_room_chat/res/layout/activity_room_message.xml
View File

@@ -11,27 +11,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/room_msg_height" android:layout_height="@dimen/room_msg_height"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@drawable/shape_white_top_14dp" android:background="@drawable/shape_1c1b22_top_15dp"
android:orientation="vertical"> android:orientation="vertical">
<com.flyco.tablayout.SlidingTabLayout <com.flyco.tablayout.SlidingTabLayout
android:id="@+id/view_indicator" android:id="@+id/view_indicator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="46dp" android:layout_height="46dp"
android:background="@drawable/shape_white_top_14dp" app:tl_indicator_color="@color/app_248cfe"
app:tl_indicator_color="@color/appColor"
app:tl_indicator_corner_radius="2dp" app:tl_indicator_corner_radius="2dp"
app:tl_indicator_height="@dimen/dp_3" app:tl_indicator_height="@dimen/dp_3"
app:tl_indicator_width="@dimen/dp_9" app:tl_indicator_width="@dimen/dp_9"
app:tl_tab_space_equal="true" app:tl_tab_space_equal="true"
app:tl_textSelectColor="@color/color_333333" app:tl_textSelectColor="@color/text_title_white"
app:tl_textUnselectColor="@color/text_tertiary" app:tl_textUnselectColor="@color/text_secondary_4f516a"
app:tl_textsize="@dimen/dp_16" /> app:tl_textsize="@dimen/dp_16" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:background="@color/color_f5f5f5" /> android:background="@color/line_353548" />
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager" android:id="@+id/viewpager"

11
app/src/module_room_chat/res/layout/activity_room_newbie_list.xml
View File

@@ -11,13 +11,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/room_msg_height" android:layout_height="@dimen/room_msg_height"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@drawable/shape_white_top_14dp" android:background="@drawable/shape_1c1b22_top_15dp"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="@dimen/dp_5"
android:paddingBottom="@dimen/dp_5"
> >
<LinearLayout <LinearLayout
@@ -31,15 +33,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/find_new" android:text="@string/find_new"
android:textColor="@color/color_333333" android:textColor="@color/text_title_white"
android:textSize="@dimen/dp_18" android:textSize="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_15"
/> />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="每日更新推荐" android:text="每日更新推荐"
android:textColor="@color/color_999999" android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/dp_13" android:textSize="@dimen/dp_13"
/> />
</LinearLayout> </LinearLayout>
@@ -48,7 +49,7 @@
android:id="@+id/iv_back" android:id="@+id/iv_back"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/arrow_left" android:src="@drawable/arrow_left_white"
android:layout_marginStart="@dimen/dp_15" android:layout_marginStart="@dimen/dp_15"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
/> />

8
app/src/module_room_chat/res/layout/activity_room_newbie_message.xml
View File

@@ -11,7 +11,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/room_msg_height" android:layout_height="@dimen/room_msg_height"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@drawable/shape_white_top_14dp" android:background="@drawable/shape_1c1b22_top_15dp"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
@@ -26,7 +26,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="请选择" android:text="请选择"
android:textColor="@color/color_333333" android:textColor="@color/text_title_white"
android:textSize="@dimen/dp_18" android:textSize="@dimen/dp_18"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_15" android:layout_marginStart="@dimen/dp_15"
@@ -39,7 +39,7 @@
android:text="换一批" android:text="换一批"
android:drawableStart="@drawable/refresh" android:drawableStart="@drawable/refresh"
android:drawablePadding="@dimen/dp_5" android:drawablePadding="@dimen/dp_5"
android:textColor="@color/color_666666" android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" android:textSize="13sp"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
android:layout_marginEnd="15dp" android:layout_marginEnd="15dp"
@@ -60,7 +60,7 @@
android:gravity="center" android:gravity="center"
android:textSize="14sp" android:textSize="14sp"
android:textColor="@color/white" android:textColor="@color/white"
android:background="@drawable/bg_common_confirm_normal" android:background="@drawable/bg_common_confirm"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_20"
/> />

12
app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:background="@drawable/bg_common_touch_while"> android:background="@drawable/bg_common_touch">
<com.netease.nim.uikit.common.ui.imageview.HeadImageView <com.netease.nim.uikit.common.ui.imageview.HeadImageView
android:id="@+id/img_head" android:id="@+id/img_head"
@@ -73,7 +73,7 @@
android:maxWidth="190dp" android:maxWidth="190dp"
android:singleLine="true" android:singleLine="true"
android:text="" android:text=""
android:textColor="@color/color_black_333333" android:textColor="@color/text_title_white"
android:textSize="15dp" android:textSize="15dp"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="你好啊啊啊啊啊啊啊啊" /> tools:text="你好啊啊啊啊啊啊啊啊" />
@@ -103,7 +103,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:lines="1" android:lines="1"
android:text="" android:text=""
android:textColor="@color/color_grey_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp" android:textSize="13dp"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="我是内容" /> tools:text="我是内容" />
@@ -130,7 +130,7 @@
android:maxWidth="190dp" android:maxWidth="190dp"
android:scrollHorizontally="true" android:scrollHorizontally="true"
android:text="" android:text=""
android:textColor="@color/color_grey_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp" android:textSize="13dp"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" /> tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" />
@@ -146,7 +146,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="16dip" android:layout_marginTop="16dip"
android:layout_marginEnd="10dip" android:layout_marginEnd="10dip"
android:textColor="@color/color_grey_999999" android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/text_small_size_ten_sp" android:textSize="@dimen/text_small_size_ten_sp"
tools:text="just now" /> tools:text="just now" />

18
app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_team_list_item.xml
View File

@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:background="@drawable/bg_common_touch_while"> android:background="@drawable/bg_common_touch">
<FrameLayout <FrameLayout
android:layout_width="55dp" android:layout_width="55dp"
android:layout_height="55dp" android:layout_height="55dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15" android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_10" > android:layout_marginEnd="@dimen/dp_10">
<com.netease.nim.uikit.common.ui.imageview.HeadImageView <com.netease.nim.uikit.common.ui.imageview.HeadImageView
android:id="@+id/img_head" android:id="@+id/img_head"
android:layout_width="@dimen/room_msg_avatar_size" android:layout_width="@dimen/room_msg_avatar_size"
android:layout_height="@dimen/room_msg_avatar_size"/> android:layout_height="@dimen/room_msg_avatar_size" />
<ImageView <ImageView
android:id="@+id/iv_mini_world_img" android:id="@+id/iv_mini_world_img"
@@ -23,7 +23,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|right" android:layout_gravity="bottom|right"
android:src="@drawable/ic_mini_world_team" android:src="@drawable/ic_mini_world_team"
android:visibility="gone"/> android:visibility="gone" />
</FrameLayout> </FrameLayout>
@@ -52,7 +52,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:lines="1" android:lines="1"
android:text="" android:text=""
android:textColor="@color/color_grey_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp" android:textSize="13dp"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="我是内容" /> tools:text="我是内容" />
@@ -78,7 +78,7 @@
android:maxWidth="190dp" android:maxWidth="190dp"
android:scrollHorizontally="true" android:scrollHorizontally="true"
android:text="" android:text=""
android:textColor="@color/color_grey_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp" android:textSize="13dp"
tools:ignore="SpUsage" /> tools:ignore="SpUsage" />
</LinearLayout> </LinearLayout>
@@ -91,7 +91,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="16dip" android:layout_marginTop="16dip"
android:layout_marginEnd="10dip" android:layout_marginEnd="10dip"
android:textColor="@color/color_grey_999999" android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/text_small_size_ten_sp" android:textSize="@dimen/text_small_size_ten_sp"
tools:text=" 晚上 06:00" /> tools:text=" 晚上 06:00" />
@@ -107,7 +107,7 @@
android:maxWidth="190dp" android:maxWidth="190dp"
android:singleLine="true" android:singleLine="true"
android:text="" android:text=""
android:textColor="@color/color_black_333333" android:textColor="@color/text_title_white"
android:textSize="15dp" android:textSize="15dp"
tools:ignore="SpUsage" tools:ignore="SpUsage"
tools:text="你好啊啊啊啊啊啊啊啊" /> tools:text="你好啊啊啊啊啊啊啊啊" />

6
app/src/module_room_chat/res/layout/room_msg_user_list_item.xml
View File

@@ -5,7 +5,7 @@
android:id="@+id/container" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="75dp"
android:background="@drawable/bg_common_touch_while"> android:background="@drawable/bg_common_touch">
<ImageView <ImageView
android:id="@+id/noble_avatar_view" android:id="@+id/noble_avatar_view"
@@ -31,7 +31,7 @@
android:lines="1" android:lines="1"
android:maxWidth="250dp" android:maxWidth="250dp"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/color_333333" android:textColor="@color/text_title_white"
android:textSize="15sp" android:textSize="15sp"
app:layout_constraintStart_toEndOf="@+id/noble_avatar_view" app:layout_constraintStart_toEndOf="@+id/noble_avatar_view"
app:layout_constraintTop_toTopOf="@+id/noble_avatar_view" app:layout_constraintTop_toTopOf="@+id/noble_avatar_view"
@@ -47,7 +47,7 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:lines="1" android:lines="1"
android:maxWidth="250dp" android:maxWidth="250dp"
android:textColor="@color/color_999999" android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="@+id/noble_avatar_view" app:layout_constraintBottom_toBottomOf="@+id/noble_avatar_view"
app:layout_constraintStart_toEndOf="@+id/noble_avatar_view" app:layout_constraintStart_toEndOf="@+id/noble_avatar_view"