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

UI对稿:https://docs.qq.com/sheet/DU3VDU2xpR1N3RHli?tab=BB08J2

Browse Source
This commit is contained in:
huangjian
2021-04-02 19:03:56 +08:00
parent 7240ab2835
commit 25872454a1
29 changed files with 122 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/common/res/drawable/bg_secondary_radius_100.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="100dp"/>
<solid android:color="@color/bg_secondary_2a2a39"/>
</shape>

4
app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java
View File

@@ -688,8 +688,8 @@ public class UserInfoActivity extends BaseBindingActivity<ActivityUserInfoBindin
attentionLayout.setCompoundDrawablesWithIntrinsicBounds(
(!isliked) ? mAttenDrawable : mAttenedDrawable, null, null, null);
attentionLayout.setText(getString((isliked) ? R.string.already_attention : R.string.attention));
attentionLayout.setTextColor(isliked ? getResources().getColor(R.color.appColor) : getResources().getColor(R.color.white));
attentionLayout.setBackground(isliked ? getResources().getDrawable(R.drawable.bg_shape_send_msg) : getResources().getDrawable(R.drawable.bg_shape_attention));
attentionLayout.setTextColor(isliked ? getResources().getColor(R.color.app_248cfe) : getResources().getColor(R.color.text_title_white));
attentionLayout.setBackground(isliked ? getResources().getDrawable(R.drawable.bg_common_disable) : getResources().getDrawable(R.drawable.bg_common_confirm));
}
@Subscribe(threadMode = ThreadMode.MAIN)

BIN
app/src/main/res/drawable-xhdpi/icon_common_failure.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_common_no_network.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_new_attention.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

2
app/src/main/res/drawable/bg_logout.xml
View File

@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/bg_normal_1c1b22"/>
<solid android:color="@color/bg_secondary_2a2a39"/>
<corners android:topLeftRadius="23dp"
android:bottomRightRadius="23dp"

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

@@ -80,7 +80,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/recyclerView"
android:background="@drawable/bg_secondary_radius_15"
android:background="@drawable/bg_secondary_radius_5"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_13"

40
app/src/main/res/layout/activity_setting.xml
View File

@@ -169,7 +169,7 @@
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/line_353548" />
android:background="@color/line_height_201F27" />
<RelativeLayout
android:id="@+id/rly_pay_pwd"
@@ -273,7 +273,7 @@
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/line_353548" />
android:background="@color/line_height_201F27" />
<RelativeLayout
android:id="@+id/rly_help"
@@ -538,27 +538,23 @@
</RelativeLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/line_353548">
<TextView
android:id="@+id/btn_login_out"
android:layout_width="320dp"
android:layout_height="45dp"
android:layout_gravity="center"
android:layout_marginTop="40dp"
android:layout_marginBottom="40dp"
android:background="@drawable/bg_secondary_radius_100"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:onClick="@{click}"
android:text="@string/text_setting_logout"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/btn_login_out"
android:layout_width="320dp"
android:layout_height="45dp"
android:layout_gravity="center"
android:layout_marginTop="40dp"
android:layout_marginBottom="40dp"
android:background="@drawable/bg_logout"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:onClick="@{click}"
android:text="@string/text_setting_logout"
android:textColor="@color/white"
android:textSize="14sp" />
</FrameLayout>
</LinearLayout>
</ScrollView>

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

@@ -11,11 +11,6 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25" />
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/line_353548" />
<LinearLayout
android:id="@+id/layout_addinfo"
android:layout_width="match_parent"

1
app/src/main/res/layout/fragment_no_data.xml
View File

@@ -4,7 +4,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:background="@color/white"
android:orientation="vertical">
<ImageView

1
app/src/main/res/layout/fragment_no_data_middle_iv.xml
View File

@@ -2,7 +2,6 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="horizontal">
<LinearLayout

125
app/src/main/res/layout/layout_msg_view_holder_content.xml
View File

@@ -1,85 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="240dp"
android:layout_width="240dp"
android:layout_height="wrap_content"
>
android:orientation="vertical">
<LinearLayout
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:orientation="vertical"
>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16dp"
android:textColor="@color/text_color_primary"
/>
<ImageView
android:id="@+id/bg_image"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginTop="10dp"
android:scaleType="centerCrop"
/>
<TextView
android:id="@+id/desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textSize="13dp"
android:textColor="@color/text_color_secondary"
/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/app_bg"
/>
android:layout_margin="12dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:orientation="horizontal"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="#017FFF"
android:textSize="15dp"
android:text="点击查看"
/>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_title_white"
android:textSize="16dp" />
<ImageView
android:id="@+id/bg_image"
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginTop="10dp"
android:scaleType="centerCrop" />
<TextView
android:id="@+id/desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="@color/text_secondary_4f516a"
android:textSize="13dp" />
</LinearLayout>
<View
android:layout_width="0dp"
android:layout_height="10dp"
android:layout_weight="1.0"
android:layout_gravity="center_vertical"
/>
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_353548" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrow_right"
android:layout_gravity="center_vertical"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal">
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="点击查看"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15dp" />
<View
android:layout_width="0dp"
android:layout_height="10dp"
android:layout_gravity="center_vertical"
android:layout_weight="1.0" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/arrow_right_white" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

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

@@ -43,7 +43,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_toRightOf="@id/avatar"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="15dp"
tools:text="礼物名称"/>

3
app/src/main/res/layout/layout_msg_view_holder_hello.xml
View File

@@ -10,8 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="10dp"
android:text="恭喜您，获得抽奖机会，点我抽奖>>"
android:textColor="@color/white"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" />
</LinearLayout>

6
app/src/main/res/layout/layout_msg_view_holder_level.xml
View File

@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_toRightOf="@id/avatar"
android:text=""
android:textColor="@color/white"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="16dp"
tools:text="恭喜!您的等级已到达"/>
@@ -49,7 +49,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_color"/>
android:background="@color/line_353548"/>
<TextView
android:layout_width="match_parent"
android:layout_height="40dp"
@@ -58,7 +58,7 @@
android:textSize="14dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:drawableRight="@drawable/icon_arrow_right_small"
android:drawableRight="@drawable/arrow_right_white"
android:textColor="@color/text_normal_c6c6e9"/>
</LinearLayout>
</RelativeLayout>

3
app/src/main/res/layout/layout_msg_view_holder_lottery.xml
View File

@@ -10,8 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="10dp"
android:text="恭喜您，获得抽奖机会，点我抽奖>>"
android:textColor="@color/white"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" />
</LinearLayout>

4
app/src/main/res/layout/layout_msg_view_holder_online.xml
View File

@@ -33,14 +33,14 @@
android:layout_marginTop="6dp"
android:layout_toRightOf="@id/avatar"
android:text="您关注的TA"
android:textColor="@color/white"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="16dp" />
<TextView
android:id="@+id/nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_color_secondary"
android:textColor="@color/text_title_white"
android:textSize="13dp" />
</LinearLayout>

4
app/src/main/res/layout/user_info_bottom_layout.xml
View File

@@ -24,7 +24,7 @@
android:text="@string/send_msg"
android:textColor="@color/appColor"
android:textSize="15sp"
android:background="@drawable/bg_shape_send_msg"/>
android:background="@drawable/bg_common_cancel"/>
</LinearLayout>
@@ -45,7 +45,7 @@
android:text="@string/attention"
android:textColor="@color/white"
android:textSize="15sp"
android:background="@drawable/bg_shape_attention"/>
android:background="@drawable/bg_common_confirm"/>
</LinearLayout>

BIN
app/src/main/res/mipmap-xhdpi/icon_chat.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 694 B

After

Width:  |  Height:  |  Size: 1.1 KiB

2
app/src/main/res/values/colors.xml
View File

@@ -567,6 +567,8 @@
<color name="text_hint_555574">#555574</color>
<!-- 分隔线颜色 -->
<color name="line_353548">#353548</color>
<!-- 一般用于10xp或20xp的分隔线颜色 -->
<color name="line_height_201F27">#201F27</color>
<!-- 弹窗取消按钮文字颜色 -->
<color name="color_4C5AF1">#4C5AF1</color>
<!-- 常用渐变按钮开始颜色 -->

2
app/src/module_community/res/layout/item_world_dynamic.xml
View File

@@ -11,7 +11,7 @@
android:id="@+id/view_top_line"
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="#201F27"
android:background="@color/line_height_201F27"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout

5
nim_uikit/res/drawable/bg_message_pressed.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#1F1F32" />
<corners android:radius="15dp" />
</shape>

2
nim_uikit/res/layout/nim_actions_item_layout.xml
View File

@@ -17,7 +17,7 @@
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/input_panel_text_color_757572"
android:textColor="@color/color_C6C6E9"
android:textSize="13sp" />
</LinearLayout>

8
nim_uikit/res/layout/nim_emoji_layout.xml
View File

@@ -3,15 +3,14 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:visibility="visible">
<View
android:id="@+id/top_divider_line"
android:layout_height="2px"
android:layout_height="1px"
android:layout_width="match_parent"
android:background="@color/color_gray_d9d9d9"
android:background="#353548"
android:visibility="gone"/>
<androidx.viewpager.widget.ViewPager
@@ -29,7 +28,7 @@
android:layout_height="8dp"
android:layout_marginBottom="4dp"
android:gravity="center"
android:orientation="horizontal"></LinearLayout>
android:orientation="horizontal"/>
<View style="@style/horizontal_light_thin_divider"/>
@@ -43,7 +42,6 @@
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/white"
android:scrollbars="none">
<LinearLayout

1
nim_uikit/res/layout/nim_message_activity_actions_layout.xml
View File

@@ -3,7 +3,6 @@
android:id="@+id/actionsLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:visibility="gone" >

13
nim_uikit/res/layout/nim_message_activity_text_layout.xml
View File

@@ -36,7 +36,7 @@
<FrameLayout
android:id="@+id/audioTextSwitchLayout"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_height="30dp"
android:layout_alignBottom="@id/switchLayout"
android:layout_marginEnd="@dimen/bottom_component_margin_horizontal"
android:layout_toStartOf="@+id/emoji_button"
@@ -47,9 +47,10 @@
android:id="@+id/audioRecord"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/nim_message_input_edittext_box"
android:background="@drawable/bg_message_input"
android:text="@string/record_audio"
android:textColor="@color/color_black_333333"
android:layout_gravity="center"
android:textColor="@color/color_C6C6E9"
android:textSize="16sp"
android:visibility="gone" />
</FrameLayout>
@@ -57,9 +58,9 @@
<EditText
android:id="@+id/editTextMessage"
android:textCursorDrawable="@null"
android:textColor="@color/white"
android:textColor="@color/color_C6C6E9"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="30dp"
android:layout_marginEnd="@dimen/bottom_component_margin_horizontal"
android:layout_toStartOf="@+id/emoji_button"
android:layout_toEndOf="@+id/switchLayout"
@@ -73,8 +74,6 @@
android:paddingStart="@dimen/dp_10"
android:paddingEnd="10dp"
android:background="@drawable/bg_message_input"
android:minHeight="35dp"
android:maxHeight="72dp"
android:maxLines="4"
android:textSize="13sp" />

1
nim_uikit/res/values/colors.xml
View File

@@ -73,6 +73,7 @@
<color name="color_BAB0FF">#BAB0FF</color>
<color name="color_2a2a39">#2A2A39</color>
<color name="color_1c1b22">#1C1B22</color>
<color name="color_C6C6E9">#C6C6E9</color>
<color name="text_hint_555574">#555574</color>
</resources>

4
nim_uikit/res/values/styles-widget.xml
View File

@@ -19,9 +19,9 @@
</style>
<style name="horizontal_light_thin_divider">
<item name="android:layout_height">2px</item>
<item name="android:layout_height">1px</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:background">@color/color_gray_d9d9d9</item>
<item name="android:background">#353548</item>
</style>
<style name="horizontal_deep_thick_divider">

4
nim_uikit/src/com/netease/nim/uikit/business/session/module/input/InputPanel.java
View File

@@ -778,7 +778,7 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba
audioMessageHelper.completeRecord(cancel);
audioRecordBtn.setText(R.string.record_audio);
audioRecordBtn.setBackgroundResource(R.drawable.nim_message_input_edittext_box);
audioRecordBtn.setBackgroundResource(R.drawable.bg_message_pressed);
stopAudioRecordAnim();
if (!cancel) {
@@ -852,7 +852,7 @@ public class InputPanel implements IEmoticonSelectedListener, IAudioRecordCallba
}
audioRecordBtn.setText(R.string.record_audio_end);
audioRecordBtn.setBackgroundResource(R.drawable.nim_message_input_edittext_box_pressed);
audioRecordBtn.setBackgroundResource(R.drawable.bg_message_input);
updateTimerTip(false); // 初始化语音动画状态
playAudioRecordAnim();