moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI修改:1.向右箭头统一 2.部分文字颜色统一 3.修改支付密码/绑定支付宝/验证绑定手机页面

Browse Source
This commit is contained in:
huangjian
2021-04-09 17:09:55 +08:00
parent f6bacd3c60
commit dd897aca03
33 changed files with 137 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java
View File

@@ -313,14 +313,12 @@ public class RecentContactsFragment extends TFragment {
.setCallback(new RequestCallback<Void>() {
@Override
public void onSuccess(Void param) {
// Toast.makeText(getActivity(), "delete success", Toast.LENGTH_SHORT).show();
SingleToastUtil.showToastShort("delete success");
}
@Override
public void onFailed(int code) {
SingleToastUtil.showToastShort("delete failed, code:" + code);
// Toast.makeText(getActivity(), "delete failed, code:" + code, Toast.LENGTH_SHORT).show();
}
@Override

BIN
app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_chat_navigation_attention.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

10
app/src/main/res/drawable/bg_user_gift_item.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ffefebff" />
<corners
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="4dp" />
</shape>

23
app/src/main/res/layout/activity_binder_alipay.xml
View File

@@ -15,7 +15,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="50dp"
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="32dp"
@@ -42,11 +42,16 @@
android:textSize="@dimen/font_normal" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_353548" />
<LinearLayout
android:id="@+id/code_layout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="32dp"
@@ -81,9 +86,15 @@
android:src="@drawable/ic_nick_delete" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_353548" />
<TextView
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:text="手机验证码"
@@ -91,9 +102,15 @@
android:textSize="14dp"
android:visibility="gone" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_353548" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_secondary_2a2a39"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="32dp"
@@ -175,10 +192,10 @@
android:id="@+id/tv_send_sms_code_result"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:gravity="center_horizontal"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_15"
android:gravity="center_horizontal"
android:textColor="@color/text_color_red"
android:textSize="@dimen/dp_16"
tools:text="验证码已发送" />

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

@@ -413,7 +413,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:src="@drawable/arrow_right_white" />
android:src="@drawable/arrow_right" />
</LinearLayout>

21
app/src/main/res/layout/activity_modify_pwd.xml
View File

@@ -26,34 +26,53 @@
android:id="@+id/ed_current_pwd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_secondary_2a2a39"
app:hint="请输入当前登录密码"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:title_hint="原密码" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_353548" />
<com.yizhuan.erban.ui.widget.SuperEditText
android:id="@+id/ed_pwd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_secondary_2a2a39"
app:hint="请输入新的登录密码"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:title_hint="新密码" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_353548" />
<com.yizhuan.erban.ui.widget.SuperEditText
android:id="@+id/ed_sure_pwd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg_secondary_2a2a39"
app:hint="再次确认新的登录密码"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:title_hint="确认密码" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_353548" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/container_code"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20">
android:background="@color/bg_secondary_2a2a39"
android:paddingTop="@dimen/dp_20">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/et_code_pay_pwd"

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

@@ -58,7 +58,7 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_16"
android:drawableEnd="@drawable/arrow_right_white"
android:drawableEnd="@drawable/arrow_right"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:gravity="center_vertical"
@@ -138,7 +138,7 @@
android:id="@+id/tv_password"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_44"
android:drawableEnd="@drawable/arrow_right_white"
android:drawableEnd="@drawable/arrow_right"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_15"
@@ -175,7 +175,7 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_16"
android:drawableEnd="@drawable/arrow_right_white"
android:drawableEnd="@drawable/arrow_right"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:gravity="center_vertical"
@@ -212,7 +212,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:src="@drawable/arrow_right_white" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
<View
@@ -243,7 +243,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:src="@drawable/arrow_right_white" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
<View
@@ -274,7 +274,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:src="@drawable/arrow_right_white" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
<RelativeLayout

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

@@ -45,7 +45,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_third"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="@dimen/dp_14" />
<TextView
@@ -66,7 +66,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
<View
android:layout_width="match_parent"
@@ -93,7 +93,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_bind_phone"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<ImageView
@@ -103,7 +103,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
<TextView
android:id="@+id/tv_phone"
@@ -139,7 +139,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_bind_alipay_account"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<ImageView
@@ -149,7 +149,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
<TextView
android:id="@+id/tv_alipay"
@@ -185,7 +185,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_pay_password"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<ImageView
@@ -195,7 +195,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
<TextView
android:id="@+id/tv_pay_modify"
@@ -220,13 +220,13 @@
android:id="@+id/tv_privacy_setting"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_setting_item_height"
android:drawableEnd="@drawable/setting_right"
android:drawableEnd="@drawable/arrow_right"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="@string/privacy_setting"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_14"
android:visibility="gone" />
@@ -241,13 +241,13 @@
android:id="@+id/tv_notice_setting"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_setting_item_height"
android:drawableEnd="@drawable/setting_right"
android:drawableEnd="@drawable/arrow_right"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
android:text="@string/notice_setting"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_14" />
<View
@@ -261,13 +261,13 @@
android:id="@+id/tv_black_manager"
android:layout_width="match_parent"
android:layout_height="50dp"
android:drawableEnd="@drawable/setting_right"
android:drawableEnd="@drawable/arrow_right"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:text="@string/text_setting_black_management"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<View
@@ -289,7 +289,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_help"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<ImageView
@@ -298,7 +298,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
<View
@@ -322,17 +322,17 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_feedback"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<ImageView
android:id="@+id/setting_right1"
android:id="@+id/arrow_right1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -348,13 +348,13 @@
android:id="@+id/tv_community_norms"
android:layout_width="match_parent"
android:layout_height="50dp"
android:drawableEnd="@drawable/setting_right"
android:drawableEnd="@drawable/arrow_right"
android:gravity="center_vertical"
android:onClick="@{click}"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:text="@string/text_setting_community_norms"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp"
android:visibility="gone" />
@@ -381,7 +381,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_contact_us"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<ImageView
@@ -390,7 +390,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
<View
@@ -416,7 +416,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_clear_cache"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<ImageView
@@ -426,7 +426,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -451,17 +451,17 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_about"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<ImageView
android:id="@+id/setting_right"
android:id="@+id/arrow_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -486,7 +486,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_check_for_update"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<TextView
@@ -498,7 +498,7 @@
android:paddingStart="0dp"
android:paddingEnd="@dimen/dp_15"
android:text=""
android:textColor="@color/text_color_secondary"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/dp_13"
tools:ignore="SpUsage" />
</RelativeLayout>
@@ -524,7 +524,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="@string/text_setting_lab"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<ImageView
@@ -534,7 +534,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/dp_15"
android:src="@drawable/setting_right" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -551,7 +551,7 @@
android:gravity="center"
android:onClick="@{click}"
android:text="@string/text_setting_logout"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="14sp" />

8
app/src/main/res/layout/activity_user_info.xml
View File

@@ -184,7 +184,7 @@
android:gravity="center_vertical"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/text_secondary_4f516a"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="11dp"
tools:text="ID:7958626" />
@@ -226,7 +226,7 @@
android:ellipsize="end"
android:lines="1"
android:paddingBottom="@dimen/dp_2"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/dp_11"
app:layout_constraintTop_toBottomOf="@id/ll_id"
tools:text="喜欢我就关注我" />
@@ -252,7 +252,7 @@
android:id="@+id/tv_hall_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableEnd="@drawable/arrow_right_white"
android:drawableEnd="@drawable/arrow_right"
android:paddingStart="@dimen/dp_15"
android:paddingTop="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
@@ -453,7 +453,7 @@
android:id="@+id/tv_gift_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableEnd="@drawable/arrow_right_white"
android:drawableEnd="@drawable/arrow_right"
android:padding="@dimen/dp_15"
android:text="礼物"
android:textColor="@color/text_title_white"

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

@@ -49,7 +49,7 @@
android:layout_centerVertical="true"
android:layout_gravity="center"
android:padding="15dp"
android:src="@drawable/arrow_right_white" />
android:src="@drawable/arrow_right" />
</RelativeLayout>
@@ -169,7 +169,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="15dp"
android:src="@drawable/arrow_right_white" />
android:src="@drawable/arrow_right" />
</LinearLayout>
@@ -291,7 +291,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="15dp"
android:src="@drawable/arrow_right_white" />
android:src="@drawable/arrow_right" />
</LinearLayout>

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

@@ -285,7 +285,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrow_right_white"
android:src="@drawable/arrow_right"
tools:ignore="ContentDescription" />
</LinearLayout>

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

@@ -35,7 +35,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="@dimen/dp_15"
android:text="@string/find_new"
android:gravity="center_vertical"
@@ -59,7 +59,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/common_ic_more_arrow"
android:src="@drawable/arrow_right"
android:layout_gravity="end|center_vertical"
android:layout_marginEnd="@dimen/dp_15"
/>

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

@@ -25,11 +25,11 @@
android:ellipsize="end"
android:lines="1"
tools:text="x20"
android:textColor="@color/white"
android:textColor="@color/app_248cfe"
android:textSize="@dimen/sp_10"
android:gravity="center"
android:layout_marginTop="-5dp"
android:background="@drawable/shape_bg_mini_world_name"
android:background="@drawable/bg_user_gift_item"
/>
</LinearLayout>

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

@@ -69,7 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/arrow_right_white" />
android:src="@drawable/arrow_right" />
</LinearLayout>
</LinearLayout>

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

@@ -58,7 +58,7 @@
android:textSize="14dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:drawableRight="@drawable/arrow_right_white"
android:drawableRight="@drawable/arrow_right"
android:textColor="@color/text_normal_c6c6e9"/>
</LinearLayout>
</RelativeLayout>

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

@@ -30,6 +30,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:src="@drawable/setting_right"/>
android:src="@drawable/arrow_right"/>
</RelativeLayout>

23
app/src/main/res/layout/list_item_gift_wall_info.xml
View File

@@ -4,9 +4,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:paddingStart="@dimen/dp_10"
android:paddingEnd="@dimen/dp_10"
android:orientation="vertical">
android:paddingEnd="@dimen/dp_10">
<ImageView
android:id="@+id/gift_img"
@@ -20,12 +20,13 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="-10dp"
android:textColor="@color/text_title_white"
android:textSize="12dp"
android:background="@drawable/bg_user_gift_item"
android:gravity="center"
android:includeFontPadding="false"
android:paddingStart="8dp"
android:paddingEnd="@dimen/dp_8"
android:gravity="center"
android:background="@drawable/shape_bg_mini_world_name"
android:textColor="@color/app_248cfe"
android:textSize="12dp"
tools:text="x120" />
<TextView
@@ -34,9 +35,9 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:textColor="@color/text_title_white"
android:lines="1"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13dp"
tools:text="天使" />
@@ -46,10 +47,10 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="3dp"
android:textColor="@color/text_normal_c6c6e9"
android:gravity="center_vertical"
android:textSize="11dp"
android:drawableStart="@drawable/ic_gift_diamond"
android:gravity="center_vertical"
android:textColor="@color/text_secondary_4f516a"
android:textSize="11dp"
tools:text="10" />

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

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="71dp"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 562 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_income.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/ic_hall_member_more.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 253 B

After

Width:  |  Height:  |  Size: 402 B

BIN
app/src/module_labour_union/res/drawable-xhdpi/ic_hall_member_search.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/ic_hall_member_search.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 760 B

8
app/src/module_labour_union/res/layout/item_clan_income.xml
View File

@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="1"
android:textColor="@color/text_title_white"
android:textColor="@color/text_secondary_4f516a"
android:textSize="15sp" />
<LinearLayout
@@ -46,7 +46,7 @@
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:textColor="@color/text_title_white"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
tools:text="忘忘忧阁忧阁" />
</LinearLayout>
@@ -68,7 +68,7 @@
android:id="@+id/tv_room_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/app_248cfe"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
@@ -76,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="房间流水"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
</LinearLayout>

2
app/src/module_labour_union/res/layout/item_hall.xml
View File

@@ -27,7 +27,7 @@
android:gravity="center"
android:maxLines="1"
android:ellipsize="end"
android:textColor="@color/text_title_white"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="@id/iv_hall_avatar"
app:layout_constraintStart_toStartOf="@id/iv_hall_avatar"

10
app/src/module_labour_union/res/layout/item_income.xml
View File

@@ -22,7 +22,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="20dp"
android:gravity="center"
android:textColor="@color/text_title_white"
android:textColor="@color/text_secondary_4f516a"
android:textSize="15sp"
tools:text="1" />
@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLength="6"
android:textColor="@color/text_title_white"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="14dp"
tools:text="吉林吉林" />
@@ -54,7 +54,7 @@
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_secondary_4f516a"
android:textSize="12dp"
tools:text="吉林吉林" />
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="234dp"
android:textColor="@color/app_248cfe"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="16dp"
tools:text="吉林吉林" />
@@ -76,6 +76,6 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:padding="15dp"
android:src="@drawable/arrow_right_white" />
android:src="@drawable/arrow_right" />
</RelativeLayout>

2
app/src/module_labour_union/res/layout/item_income_gift.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/iv_gift"
android:layout_width="match_parent"
android:layout_height="109dp"
android:background="@color/color_F5F5F5" />
/>
<TextView
android:id="@+id/tv_gift_name"

2
app/src/module_labour_union/res/layout/item_live_tag_dialog.xml
View File

@@ -18,7 +18,7 @@
nomalUrl="@{tagInfo.skillPicture}"
android:layout_width="75dp"
android:layout_height="75dp"
android:src="@drawable/default_cover"></ImageView>
android:src="@drawable/default_cover"/>
<ImageView
android:id="@+id/iv_select"

6
app/src/module_labour_union/res/layout/item_member.xml
View File

@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:textColor="@color/text_title_white"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="小涩瑶小涩瑶小涩瑶" />
@@ -126,7 +126,7 @@
android:id="@+id/erban_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textColor="@color/text_secondary_4f516a"
android:textSize="13sp"
tools:text="ID:8888" />
@@ -182,7 +182,7 @@
android:layout_centerVertical="true"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:src="@mipmap/common_ic_more_arrow"
android:src="@drawable/arrow_right"
android:visibility="gone" />
<ImageView

2
app/src/module_mini_world/res/layout/item_all_topic_list.xml
View File

@@ -15,7 +15,7 @@
android:ellipsize="end"
android:lines="1"
android:text="明媚的早晨"
android:textColor="@color/white"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

3
nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderText.java
View File

@@ -6,6 +6,8 @@ import android.text.style.ImageSpan;
import android.view.View;
import android.widget.TextView;
import androidx.core.content.ContextCompat;
import com.netease.nim.uikit.R;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.business.session.emoji.MoonUtil;
@@ -36,6 +38,7 @@ public class MsgViewHolderText extends MsgViewHolderBase {
@Override
protected void bindContentView() {
bodyTextView.setTextColor(ContextCompat.getColor(context, isReceivedMessage() ? R.color.white : R.color.color_C6C6E9));
bodyTextView.setOnClickListener(v -> onItemClick());
MoonUtil.identifyFaceExpression(NimUIKit.getContext(), bodyTextView, getDisplayText(), ImageSpan.ALIGN_BOTTOM);
bodyTextView.setMovementMethod(LinkMovementMethod.getInstance());