From dd897aca030fd2d641b970e44b52444abc4c1c01 Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 9 Apr 2021 17:09:55 +0800 Subject: [PATCH] =?UTF-8?q?UI=E4=BF=AE=E6=94=B9:1.=E5=90=91=E5=8F=B3?= =?UTF-8?q?=E7=AE=AD=E5=A4=B4=E7=BB=9F=E4=B8=80=202.=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2=E7=BB=9F=E4=B8=80=203.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E5=AF=86=E7=A0=81/?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=94=AF=E4=BB=98=E5=AE=9D/=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=BB=91=E5=AE=9A=E6=89=8B=E6=9C=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/im/recent/RecentContactsFragment.java | 2 - .../ic_chat_navigation_attention.png | Bin 0 -> 1614 bytes .../ic_chat_navigation_attention.webp | Bin 1038 -> 0 bytes .../ic_chat_navigation_attention.webp | Bin 1832 -> 0 bytes .../main/res/drawable/bg_user_gift_item.xml | 10 +++ .../res/layout/activity_binder_alipay.xml | 23 +++++- .../main/res/layout/activity_create_pk.xml | 2 +- .../main/res/layout/activity_modify_pwd.xml | 21 +++++- .../main/res/layout/activity_room_setting.xml | 12 ++-- app/src/main/res/layout/activity_setting.xml | 66 +++++++++--------- .../main/res/layout/activity_user_info.xml | 8 +-- .../res/layout/activity_user_info_modify.xml | 6 +- .../main/res/layout/dialog_gift_number.xml | 2 +- .../main/res/layout/fragment_recent_list.xml | 4 +- .../main/res/layout/item_userinfo_gift.xml | 4 +- .../layout/layout_msg_view_holder_content.xml | 2 +- .../layout/layout_msg_view_holder_level.xml | 2 +- .../layout/layout_phone_country_choose.xml | 2 +- .../res/layout/list_item_gift_wall_info.xml | 23 +++--- .../nim_recent_contact_list_item_new.xml | 2 +- .../main/res/mipmap-xhdpi/ic_search_main.png | Bin 562 -> 1204 bytes .../res/drawable-xhdpi/bg_income.webp | Bin 1966 -> 14128 bytes .../drawable-xhdpi/ic_hall_member_more.png | Bin 253 -> 402 bytes .../drawable-xhdpi/ic_hall_member_search.png | Bin 0 -> 1253 bytes .../drawable-xhdpi/ic_hall_member_search.webp | Bin 760 -> 0 bytes .../res/layout/item_clan_income.xml | 8 +-- .../res/layout/item_hall.xml | 2 +- .../res/layout/item_income.xml | 10 +-- .../res/layout/item_income_gift.xml | 2 +- .../res/layout/item_live_tag_dialog.xml | 2 +- .../res/layout/item_member.xml | 6 +- .../res/layout/item_all_topic_list.xml | 2 +- .../session/viewholder/MsgViewHolderText.java | 3 + 33 files changed, 137 insertions(+), 89 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_chat_navigation_attention.webp create mode 100644 app/src/main/res/drawable/bg_user_gift_item.xml create mode 100644 app/src/module_labour_union/res/drawable-xhdpi/ic_hall_member_search.png delete mode 100644 app/src/module_labour_union/res/drawable-xhdpi/ic_hall_member_search.webp diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java index a42bc76f3..fc92e1627 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java @@ -313,14 +313,12 @@ public class RecentContactsFragment extends TFragment { .setCallback(new RequestCallback() { @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 diff --git a/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.png b/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.png new file mode 100644 index 0000000000000000000000000000000000000000..50876646996c345b47c30a74d5ac321708ace055 GIT binary patch literal 1614 zcmV-U2C?~xP)=ZP};lOc6Vt28xR{41r_ODS{ub`kw=1Je3S%GiHUqcVxr%S@sVgX zK4MIK5lD<8!UqT>_-NYQEk4l12P)8j(A}2q-6D;&#eK{%_qA?o+g)2VnmC_2J2U6} z=6}x2nOnlYtkJ)W2mcKq28(cI-)d51GqJdqfl2^_0G$M7!jkD=afN#5nlC9emcpU( z-g&}JE0`$=AV8pE5aI;>ObW3}J5zRaw6%XwC{%f_ij?%bV6ik$IC}-~;;$w0<%Xl) z3&vaqQ`ncdO$a>9Om)DR5nw>>#B_Q{JLdT%*UvDZjzGLxLWIDmC^)wWJpgZ$5eG!eg)rp$Kf8ako4rd>)GT{R@R zkx1OjKwyMd9-&B*hz}BQAf?FfkfI@is1n2*0b2Dt0Dl~dsg3JE8RNGsP}m=T3J{N) z6A6P7+*B9!w2ijaBa7LcjO)!T#p9!ZB?OKntr zB@5I#zgu+=PB{Zck@2GfesF2b^IAUL4ON+^J;8)U02hJr3rY9=!Jb*C^Q|2w04O17 zu&OpXd&pEM;@7t_sKqw&MKD&jgg{0J3TnH+if=)pICxCGQ0Te?)hDLTxLEoN^SMxn^=P7S?vFKmHRyVV}MLM2@fHT1;Kw zoU;84T49n3xiQ$~efzHh3RNX;B8d-(>9kao`ekQIes*lz_t6_xpZ94o&ngqB!>4bP zM9*5M47-Cd^^U&^DB{;YV$hAIOYq8NG0%R-cEq1}pMl#gzx;48=6T)(3i_%kmGNC4FE>s!+Eu+$Or@UyOtDybq1Np=mMtBT zfZk?TXn^H2TDR9KBa>(mzrKS(&DJU6gId(nl%vj*3_NC!g|w*0cpdy+%i4X3HG;6$ zK7vCTNek+`%ep4Y6Ar|iz`_WRwP_*iv@UPR_%p2PK1`z%U=$mDNtxU0qU9e912Wz+ zkwD@wn3gy@3P#lxg_eR`@b=2yMj@2<0bFV)>@F?lxihOyK;O$uYs^0Lkzluao#SWN zd#JstHz+bnyB+gveJNC>P?f$|Fg?T)>m3^ax&*nes*TP(XXR_6nSdR(P0k2;Lw%Rm z@M#BUgtv%aZ(-0@dvqX!^wRoh#kcvOLbLU|NYXpQ<`H6<43^jTs6QCLw*}5#>4Gc7 zjG2~w`HB|xZpmHqhbOH0P~#$_zFclk?36{R+Pcn4eLSdP8?l@n!bRGkB|P0mx4pW@ zBZk}^0IF>}#|P5sMI)=is9zmzm5GHe1&6ac0evltlFP?~YW4R8+>k9s3CMunsEewf zI~!=7^K*$inf?$&*O;t?evr_DU8UcR+~k;_L7~d{Ekt4;2rfG@zj3AH&CWfNFNDr` zsOtPIN~aDvFaReG3^WmEg{=7>D4$Bd0g;4mLv#lcHUIzs M07*qoM6N<$g6InXlK=n! literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.webp b/app/src/main/res/drawable-xhdpi/ic_chat_navigation_attention.webp deleted file mode 100644 index 97800b8dda0163f94ec9bef9cbb69a6737324793..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1038 zcmV+p1o8V)Nk&En1ONb6MM6+kP&il$0000G0000b0018V06|PpNPGbR00EEVpp7I) zde`jkXa0Z_hKR_EuSAI(&8)?~w}$skKGPSAomhukw{)@+wx&&;vQhE}ux#5l9i7-o z*|u%lwr#Kee_rI>R0ksZKLL`{sm|r|r_bxP_PCO0S-JUnI$!Qc+l5A6Fy43j1HF$J zUxq^#$vv#Mcd_0{8UmZZQG015T-KKL2%i8eU&1HYp|(fS7e zpjQ)rgaNUvySr-;%OSXrD@|}7u#sR;Y=aljq%1+dI2?o}F zoC3-Nq+O)oK{>i ze!wHZB$b~qmjluZ^yGjn!cTKH<6oFR$8_N>_-)SO726k`BoER-;e;DOON8AY=jn0B{cgodGH)03ZN9kwBVCC8MGtrE4&-5(#VooimBEf4FgD zZ+l^por#SA9$-IRJ!-ljI)FU@JhOjez7PLzy(V)2B8h(r?}7NA4VzWN`5z>IkAHjg zS@cQuXZr!{f%@cAsy@BZ>|0w?jF!k9t@)slBMhHUKPaDgtIR zPeY6YW@!ZOQXbUfs8uZnZTPP)FaM6Xl9$iV^Rel_;r39ZJ-5Q&ulxu52>e{-*UW#U zOzr<4>zc6!q~=bJyWkhilS1&;j~;RbAbf9PN3?>!;ur$ zuib6k)?JXhqbiJPq_qpSE;o{;=3Cz3-Wh% IFn0I=0CD*TvH$=8 diff --git a/app/src/main/res/drawable-xxhdpi/ic_chat_navigation_attention.webp b/app/src/main/res/drawable-xxhdpi/ic_chat_navigation_attention.webp deleted file mode 100644 index d4f0499a4b6f9996e0d631571d87fb62a5aa2781..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1832 zcmV+@2iN#gNk&E>2LJ$9MM6+kP&il$0000G0000u001ul06|PpNFD95!AJ%C;LeAlSfBHdR#skHHQ zs-CawktQvNZ+=pq0Qk{IC;NN?Xt+4m6ty|#QiCdTb#jWRjiIM%0Q*J@jVbj&Y^5c- z*3!Cv>Q}WC-K?b%pmDZW>T@8vPW+DgY&*Xvir=M8!0R-RnJzfDTlg~iA38kB@RfDW z26wT?EueOu1ZbKP;KWkkiJ|ED75J1LM6ekzfZ|??u_eGU3GHs6W{zTB9WW(4V}QsO z#kx4qK0K`f`>0}z3#5d{NPv4vvC#(7!y^v3ClxEBK&SAu0_-D-d3C_F@Qec@TNUF= zfMemA4b;q4bomCn%?M5VBFFjISz+D)O%~?F}}#7tQ1u(?2ym?ylG2B@kJfyzI*^&N@9~Z3HMBlr-xmut!f?-v^v~?V5q~ zs{~?an}f`40N9h(3^I>Lf%;A90T~^K4Ie&y!Xx0!@ZrOU4{fO-Z65+|#o~Y_z5AP= zpI^`jROjdC=l^}xM?>0taDdqSv_L-N|ACJ5dFlW)TQh?w3gCs7G2{#2*6a;pebiUu zG%b<-zg>XKZTy)77B5}8boEQ%+R~*Ytt`p531j7Rg#z1K|GLo|m)aZ2~^F@yNXj>_~#h z;5RnfMSVTYP4!O6u%t-O3lSare7c8NOZQGqO^#Uee|lAKX(8e6ext0(aUzv3CL0oV zWAKVSd)JIklm9VRP&gpm0{{Rp6abw8Dmef!06u*%lt-kaA|W^Wtx%8;iEIF|AM!gV zy?Kt)f5U4Co}SC60k#9o2ScAg4v-H(4w6sZFWd}34#TUp>j3iyY3zjGm+=9_uX_x{ zf46#~e&yn8^AGgC!5_=Nw|Z52#QnzhBK?XTlsv9>0X#FPI>4rQ+^bzkV>16;M)X(* zdG?T&{#uGsr8EuLlc{kr>g{`!&A)L=bPhUJ1>0eO0092;{I}Lj{O`C++0BJSuD}Lw z>;Y8Op~kjq1(tE5v$V2Bke(?8dP8PbkHSbYTy3}fRk&{i%r222N#zw&);R` z9#BQjr>B291U4Pp@PeH{{1VVw0bHo-7;5UOslUn0ayYM?DQyZy){%Zf^^d!C;N_hQ zcrfS!S8!@c@mm;l^BJ1T5`NMlM!zZU+PC$hY38@WtiSb$SBAG$Ld`zl3)u29K~6vB zlqP|UIyM$wC$Vm&5mXi?Xi}`Mz;dA%(=G@0yveSjqMxKddid9z)hJF9V zJV%gYl4$Z9zUg-DK(2Nm3%T~W~tlzp@l#I!rvS7++ z@n5UMi{f%O5W`;Ij;tEPX&s?K5LucV#5CiNg#ZGdoK*3UxeH=D8K*;ZG1 z!S#I5TT`5|*2jXTW7g~#A`unMaxB)rebwVsTvxQEx`ST7v__K^#lPt2F~?YWGt8|Z z?`;>eGUL1dPx=2(`K5J@LzOyqFt!-x;WKDCAOQ*Xg9RWDbdGyIL>3PK|8Lg)wXGM| zzCGyw#@^b#zPKFr&hCMAJx?JMIXZ@EMTP3lUPcb!Uow`H7WKIKE29y`fk!fXn7!C# zh|29^{Mo<(ugHp!bo(Ww&G?}SAY|{Zr=ZQxCYH;bJ{X;5)~XZm+3n*DARy&7<&LUW zIXxBBLBpM|6Ul^ diff --git a/app/src/main/res/drawable/bg_user_gift_item.xml b/app/src/main/res/drawable/bg_user_gift_item.xml new file mode 100644 index 000000000..b582ca27e --- /dev/null +++ b/app/src/main/res/drawable/bg_user_gift_item.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/app/src/main/res/layout/activity_binder_alipay.xml b/app/src/main/res/layout/activity_binder_alipay.xml index 6d7ee9de6..e88a4cfe3 100644 --- a/app/src/main/res/layout/activity_binder_alipay.xml +++ b/app/src/main/res/layout/activity_binder_alipay.xml @@ -15,7 +15,7 @@ + + + + + diff --git a/app/src/main/res/layout/activity_create_pk.xml b/app/src/main/res/layout/activity_create_pk.xml index ff27f9a40..ad0ffeb45 100644 --- a/app/src/main/res/layout/activity_create_pk.xml +++ b/app/src/main/res/layout/activity_create_pk.xml @@ -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" /> diff --git a/app/src/main/res/layout/activity_modify_pwd.xml b/app/src/main/res/layout/activity_modify_pwd.xml index 0ab21e740..08bc9d534 100644 --- a/app/src/main/res/layout/activity_modify_pwd.xml +++ b/app/src/main/res/layout/activity_modify_pwd.xml @@ -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="原密码" /> + + + + + + + android:background="@color/bg_secondary_2a2a39" + android:paddingTop="@dimen/dp_20"> + android:src="@drawable/arrow_right" /> + android:src="@drawable/arrow_right" /> + android:src="@drawable/arrow_right" /> + android:src="@drawable/arrow_right" /> + android:src="@drawable/arrow_right" /> + android:src="@drawable/arrow_right" /> + android:src="@drawable/arrow_right" /> @@ -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" /> + android:src="@drawable/arrow_right" /> + android:src="@drawable/arrow_right" /> @@ -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" /> + android:src="@drawable/arrow_right" /> + android:src="@drawable/arrow_right" /> @@ -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" /> + android:src="@drawable/arrow_right" /> @@ -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" /> @@ -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" /> + android:src="@drawable/arrow_right" /> @@ -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" /> diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 2fe8bbd42..7f8094c95 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -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" diff --git a/app/src/main/res/layout/activity_user_info_modify.xml b/app/src/main/res/layout/activity_user_info_modify.xml index 0a1c358ad..fc30eb354 100644 --- a/app/src/main/res/layout/activity_user_info_modify.xml +++ b/app/src/main/res/layout/activity_user_info_modify.xml @@ -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" /> @@ -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" /> @@ -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" /> diff --git a/app/src/main/res/layout/dialog_gift_number.xml b/app/src/main/res/layout/dialog_gift_number.xml index 9b2352b3e..baca80830 100644 --- a/app/src/main/res/layout/dialog_gift_number.xml +++ b/app/src/main/res/layout/dialog_gift_number.xml @@ -285,7 +285,7 @@ diff --git a/app/src/main/res/layout/fragment_recent_list.xml b/app/src/main/res/layout/fragment_recent_list.xml index 11120ee8e..afcfd822a 100644 --- a/app/src/main/res/layout/fragment_recent_list.xml +++ b/app/src/main/res/layout/fragment_recent_list.xml @@ -35,7 +35,7 @@ diff --git a/app/src/main/res/layout/item_userinfo_gift.xml b/app/src/main/res/layout/item_userinfo_gift.xml index a3912ca9a..335677ab4 100644 --- a/app/src/main/res/layout/item_userinfo_gift.xml +++ b/app/src/main/res/layout/item_userinfo_gift.xml @@ -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" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_msg_view_holder_content.xml b/app/src/main/res/layout/layout_msg_view_holder_content.xml index f7cf28fb7..157c00f98 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_content.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_content.xml @@ -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" /> diff --git a/app/src/main/res/layout/layout_msg_view_holder_level.xml b/app/src/main/res/layout/layout_msg_view_holder_level.xml index f8a6fec68..79f091378 100644 --- a/app/src/main/res/layout/layout_msg_view_holder_level.xml +++ b/app/src/main/res/layout/layout_msg_view_holder_level.xml @@ -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"/> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_phone_country_choose.xml b/app/src/main/res/layout/layout_phone_country_choose.xml index dc8650117..47bc2ceb3 100644 --- a/app/src/main/res/layout/layout_phone_country_choose.xml +++ b/app/src/main/res/layout/layout_phone_country_choose.xml @@ -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"/> diff --git a/app/src/main/res/layout/list_item_gift_wall_info.xml b/app/src/main/res/layout/list_item_gift_wall_info.xml index 245a65019..fe3cff785 100644 --- a/app/src/main/res/layout/list_item_gift_wall_info.xml +++ b/app/src/main/res/layout/list_item_gift_wall_info.xml @@ -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"> @@ -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" /> diff --git a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml index eab8e25cd..1ad9e3599 100644 --- a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml +++ b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml @@ -2,7 +2,7 @@ +Lb|V*mgruC_1UL@>=myXZpb3BmV1|gk1CRvh10f<`R*S|; z`@SPIJUp4uGZ7C9CfWIKpjuYXGr%##2g`ukwK)ih%#%W16`At`ND8HH-H!r|%L+uPf-^#Ca!DKj4fygl#FX(9C6 zh=_faeJV9^qw8v;o-qT|VHnXf^};B>;o+(4HO>7NKtulO+#Vs?KKBJ=S@tu`c-AvM zX&Cy})xZ>drL>O%*p&yuVIlNBUqHpz#f(1F)DN!>(Bwk^z3pj@8isz8U!ZdU+VUsS zI_iA_O8@NCsk0k$xrU#--xn7aqK!R0lqT9-QAIiwE#+|d0jS}S+3Mz(22z3>!+&%C6o3P5n7d@>uR@l zc1F@`0W>sp_NqXj;YUx)nVp@#w72)Vg{nYO+DQP$QpaHIF-`r*S^!zr& zVd&TTP3o5b9Q4ZbxDfhMsjhZOnRx@?M?9S)hN18A1!P&a$&6voILqv8G|lyeP}jwk zO4+*WVhq6L-a+pdLVw>Eka`p?EAusgn>~kPhM}tovF;_M{W^esp1^oGJbg{Mr>NXp zb{~M{6AEt;_;^$ZT>-AR%8nn&q==mkb$D>m;C>)*EEo)Y6^}R1slCC$A1(=n8gEfiWyW3r zEh|9(Mucrb=&H5U7NLT5ey(182f(&68h-*f4gFlECD30cI+-*+ Ss0$eY0000Jx literal 562 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dybpbvhu0VSE^5t8=VEy{_Kzh@r zOJH5d>~u6fhz>)0?m>j zzhDNwqkrVS=rFsny?HRp{=%-M?YXh0oX>Aw*)p$8@a+EnTCw%3Qo{TK)!)vupTfYv zXyxhR7-Dg{c2atCvjR`s<2Bpf*{+T|F8lvKzZ_?%$Su41PM;>RDroMt+@Tu$>`?Tb zbBX$|?p-+KmatLwdCcCrM6S;L{o?6GaZNh)U)E}fPB+R6-cvd6NZ}06Pn(bWtIe~n z58vqKzfJCa#jJ$$7Ye3t?r84k-KMm6O;>18;{QcA*jjnoMMH)2*cJpOJ(impp~%vk zur{&a@TXG8eSW{%rI}>=fBVjoEN8J|{qAleV7`i9a@`j9nq#iwUw$N|^xipDdayLQ z%xh;zj?bH>7n8ykO$g|3lDHjG_BUboA=WhM_QM=}YB%Hzmc9=;!GGzosP>e;X^Pt? ztmFAUOK_Rud_6He^{mHi`Pp3cN$%&iE@~)95n3J16CCPrBUDN1ti@;VK)LJUc6*!j qa=S$CDTy-H1Rq&b^iX>n|Nkg{!xQr(J<5PV&*16m=d#Wzp$P!Zn+nnZ diff --git a/app/src/module_labour_union/res/drawable-xhdpi/bg_income.webp b/app/src/module_labour_union/res/drawable-xhdpi/bg_income.webp index fcc4345166641779e9f9ee8c1fca5d714c28ebc6..e58cb0b9352c66e20084f7dd8de3f6602f94758b 100644 GIT binary patch literal 14128 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
    S#)jJ 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 literal 1966 zcmV;f2T}M^Nk&Gd2LJ$9MM6+kP&il$0000G000270sx=@06|PpNUs3^00BqBIFh6` z^aAqI*S(Z~nj{esStb)z)X0x$4qr99aT&c^5F-R~^c|TI1tdwfO-z$iESC0Z<9Wx?-`t*)1DF!49|}V50NVd=&Ojk5ks_b z)nt%vxyXH>l+HV?7^YVa6$a|6-43aCHbsVNX<1{HCZ#gJSfwSYHiLDW)DEq7l=wp{ zLk)&&>H*dQu+D(>23X&K#o~YBf8u}Qf8u}Qf8u}Qf8u}Qf8u}Qf8u}Qf8u}Qf8u{o z_YGKYfOQ5e30Qr=(twrtLn}jShgLgMZM15W%KT!LmZa1Ms|+cnidZErYKK%ivaKRj z%}%XwYDJFu50uizNwrW)lG`yx8FC%DL8#k^JC%CDC!@)0<_VpQB=7NSY`RO5pV1*Q zjiTgp^AnZ6n&f|Wib=C91zO(W(Y``~mp1=MBu$AzS?C`BFvuKrfx?@p_m`K~_aD^J z@A9(j*As-|09H^qAkYN>0Ps5iodGJc0-*ptkw%?NC8MIEBXLN;uo4MpZr^lI?%*CY zf8VH~b2T>#`GE7q=#uJk-fhUFUyW>$o`1&qT=~b?5BSIPpGI#`AFLk0AFe%76M0jj!|;BKqPDusps4jeale}@+r0dxoRQB zo%#0s>P_3Rc-jS>`S%4Ma_omRJ&)Hu$8Qfg)8c^FL5_bo&?v%fyzqwbr_w$#Wb434l(Tk&)G zjo4)Q*7wVul7QDD6PiBdsD~ZlUX48GqJJ#uLx+6OmG&xk90^Y8JY-I3kROjEk|RYG zRwAHMaToYkJwv0;{=PtB#uvvWUi*oja;Rr zN$IN!KIOenEG92MygkIwTz6G zW6brH&&Qe8DpFaGGptmkvmZ-X$kj^jmswJh%z2)&r6rjt-~j&q{%(5@A#s3qxxJ7$ z;Gyy^tpCfkaRY!lYiyz-917Rn2iw`O*fbl=F+6DF4+3wuTxy$0@9^;ck_yZA9iGQ) zoXjc6*Tfe-n)+56mAN~FB(T7}d{0Dw^lAH=_tRI6s3-tw1)657HySSY*AHP1Z^T?| zxp?O{{dyaAI!k>68c(6>{GIG0xlngn;VgXyL|Kunn2kTpuD^Z6S@J$o{Wx_bT%lAh zF-?ZP=!K#+B}w(ydGLf+f$sG3emX1gEkta8rf3x+@s&JK&Mf}@4R>r@cx{vU_k?rH zzAsRH9eD_RK8f5vixM-{_^A1jcN)uybiz=if9kR2I4!EHo)^D500B>fggN+TLPYEZ z{QM1zzW$&CM1E@C)8@_Zv@@@F*oVT|nvB4^N#+u))2sF)N}Sb=qPfWc1je>^A4^it zek3j*qzW3oyukwp0=_uj2Ni7>RFyG2Ap8VVXx^leE)FynZaG8T2Nv66yzMIZ-~bZz z`OZ%1X$_MQ{mGkJtIZNbaWv9(P(da0fn-qLJ)8*Nk+UAOH>Evk12}MJ2tQ z54FKp53nvQ+qlhoWqyOn@%k8&m5p2GJ-1Icp^68w$X0^@93D!D_Z^^4fb6U81#X(4nZ{g1&B2@);b!|H?5=DeLceGq-vmG1&P1K0k z3?7w%hl1pDb-7SR5lku*!e50Qcz>}x&YL_akCV6NLAdO>dV+lD)D>Fkr}k^%Sa8LV zWIbEmY7{TR36&SwZr{6}5Rf39 zloYO$tH(e|XFTfA$qFJ;6#$|-bdL1wkc15Id>g%Rf1AgZ(atirKYz(@P7rMSaDT2> zEHI*1quk^qKSp{RgQPaK>*wH}LS&u8MHpTnpJu5A4p=ng8z-s{zLIjN-%a)!Ofa0& zHsIAO3sf+h@vNPCV?XGV=kqHPWi=0qcoW+D&=K$I&K37yxikoMpo2=P zD~{BoqaG*zTg@ftoRT)d&{ggeB(D!x=#CmQ!<|es`Wm!w|3>i@u#{tc2pYG|>s~$R znHO!ezh7|1`acIh@7ZDY?n%Pos1Ur>#sqe1pm>IP!bh!W0000000000000000Fda$ A?*IS* diff --git a/app/src/module_labour_union/res/drawable-xhdpi/ic_hall_member_more.png b/app/src/module_labour_union/res/drawable-xhdpi/ic_hall_member_more.png index 5ae48aa9511412d7925bf0c146644d2ceb2ea71d..ad8ad0393fff69c82f2e2b3f07c35b5435ea10d7 100644 GIT binary patch delta 386 zcmV-|0e$}c0g?ld8Gi-<0016@S^)q60a-~zK~z{r?Ulhw!$1^8?}Ok*>B2%I=nrUc zTWAve68(nSh3GG+AoUyk6Qw144Z3%ufw(BTkuXmx3SrWkd5c+8-fZXQ&gIN~6T*ru zTCu#)z`k!x2`gcXfL1~)p_TC60VS-2|0baCu2+!;gSyt{C zQ#}IMsO`N6LABTKZ$I05iTCff4uM}w0GrlfZ*d%Un*m;i0L|%Ii;v@Y>$<6T_x{g; zo0VY3MUsT4OM5Eu1Yo_k_Ynluu4^Thc{>xX4aU)T>05?wGARy-`08iq9++vAB)!{~ zp>y(f8am(as?@)A=%j|e^%__SOMlJ2iAnvn!%|{Wy%LrZlj@bQl$cbngr&r!dL=9+ gCeS0KG=)vC2?*KXLbVcoiQ zt5>fEve$qCkO35dvw>VRVCa{<2&iAUB*-tAflWr%#?~&sqjSQ7#u}HvTpwSA08<*y~uEmO^M%R&&k`I40t|sFL6yz{Vb`Z zQ@ihGaN1g{pKIbS{$cPwx@uX5kx4(__1b7_@(DVZFVdQ&MBb@0C%}<FRjw%zI0?dnFXPUsN33?cBQR~OPahRuX&k|(&pXQwCEuB&zy6< z=aX~Kz2`o{Wwz)t<3$a4rFX1W;aY{~RiM@qwU$_kmXLB{6Ht5zKqr7!0F3}N0Fy-Y z6Mz&zUkK6iU9~$R>NUI%cu3J4L>%>1HZ#J*DTU&v=kzl-=Cy#SXzp+S-~|NwScS zl-c6|Z+C5Hgow5g5&P*W0jJZWx7fBe?20)%yE&1Fp7s;3WFH(Hze&^V9|6>rTEk8X zvGyB3O(kH{v|eV$E3VkrhN0i%C#+(Z(mDcQcL^Bp3Zd`wi&FyjwgVBK5<-8^Pgun+ z<=CSDeOzt}!_aT@i&F(Y4`6Mn655vK7_pAl$&=?c6bf~}xsbEDT(lvXq(UWVRbc1Z zn(H-9Lo6QGEx$^r+NHEE9kg67ygHd&J+&Ob#qyLY6ts1noh_rPK$ZM58D5poXD{6} zq0nse)~)L=R1KU;S>r@#c7$wOyS<~MC9@pB0|V!-4Tb7{b+w99Q!`g~b={b&8dypz z1;B8GnDJO5p?|a-z*3HF2dF$Sel`sK20vZZ9)1(Repl=>!_b|#Z`Di6><0kvafNye zLx0>)R0-HLtpqa$U9miKabqH}uDq3gITp01)0S@A7y)p#>+pbK=tup;lz^SlW}4X_ z0Nh#<Gt+D(~hmb|CcN3>l-#ZyTXjU0Gbw{`hy7DgwUO<({}|1b`(qB zb+exU*tST9zX4nX5Lx6S)tQ_jPpmTZl7Q##31&@7YY!2<1Yo^yX-W>`M0}uF)H0gJ zUjn$s3vJtcUq?qQT}f-nz-3YA!*ph*WfwC$!{iPC`n-frZx0aB(S`>5NLyR%FUKyW z%hK8YYdpONrI++1Ll=V4VaW9`+$0#4cM_KBP+0P z(kKL@NRke}K#j&AY>46_OlWLCmqs%jXq-W@Mm9WK6<#1+Lja$`8)RzOfE0yGDACA) zSBJtjv}n}9i71Z1qQ*4LX;i>dZgOe&5YaI0!$NYCaBA0(2+*5MqXC_wy9BRoi8VaI zwnfQ*49o=Lxkn8!BBGsl2;7fXdqte(!&gM#S7?cMjhGKNZ$!TW_Z3=VZaZkmmS|WeVpGj09H^qAYuUk0I&%F zodGH=04xALkvx`1rK6%DE;tOxuo4Mr029sm0Hx*P%jn-=Pu32meu+P@2~xwV6eOxI zT+V0-y0|P+8?ahS<~>$6Z`ja=IklvU(90Sy3HSg2{{Ho=`Ul~Vkb!5_J*`k@tFuqE zeuH$0G{S<};GDk})WSa!HJAz0X@VbAEIOl4j_9>Iy{@3JcJ2#Ss;UEGn(3D!_c%kZ9dp4QG;=zi+eIKY|cP=m*BCu>W{a`tgI{pc8DqHh(r z*Yz0~-{B|!R_E*I7`!FfW|y$Y^{;A#98N!uR?qB&^2#*c=>Uu8LPfm(so&=t(nu@% z|8M-ZK2+ijp$n0ZzisV2)TiQm @@ -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" /> diff --git a/app/src/module_labour_union/res/layout/item_hall.xml b/app/src/module_labour_union/res/layout/item_hall.xml index e9ce35b95..f70719690 100644 --- a/app/src/module_labour_union/res/layout/item_hall.xml +++ b/app/src/module_labour_union/res/layout/item_hall.xml @@ -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" diff --git a/app/src/module_labour_union/res/layout/item_income.xml b/app/src/module_labour_union/res/layout/item_income.xml index 4f0ab788b..c0ff926b0 100644 --- a/app/src/module_labour_union/res/layout/item_income.xml +++ b/app/src/module_labour_union/res/layout/item_income.xml @@ -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" /> \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/item_income_gift.xml b/app/src/module_labour_union/res/layout/item_income_gift.xml index 7bae8e6fe..f635e9809 100644 --- a/app/src/module_labour_union/res/layout/item_income_gift.xml +++ b/app/src/module_labour_union/res/layout/item_income_gift.xml @@ -9,7 +9,7 @@ android:id="@+id/iv_gift" android:layout_width="match_parent" android:layout_height="109dp" - android:background="@color/color_F5F5F5" /> + /> + android:src="@drawable/default_cover"/> @@ -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" /> diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderText.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderText.java index dfc5d9955..69904c7c0 100644 --- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderText.java +++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/MsgViewHolderText.java @@ -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());