xuhuixiang/yuliao_and
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

第一次提交

Browse Source
This commit is contained in:
xuhuixiang
2025-08-08 15:05:12 +08:00
parent 3e7f1d9089
commit ad722304bf
795 changed files with 19580 additions and 9048 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
contactkit-ui/src/main/java/com/netease/yunxin/kit/contactkit/ui/addfriend/BaseAddFriendActivity.java
View File

@@ -5,6 +5,7 @@
package com.netease.yunxin.kit.contactkit.ui.addfriend;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
@@ -173,16 +174,24 @@ public abstract class BaseAddFriendActivity extends BaseActivity {
layoutInputPhone.setVisibility(View.GONE);
addFriendEmptyLayout.setVisibility(View.GONE);
layoutUserInfo.setVisibility(View.GONE);
tvAddFriendID.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.ic_selected_search), null, null, null);
tvAddFriendPhone.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.ic_unselected_search), null, null, null);
// tvAddFriendID.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.ic_selected_search), null, null, null);
// tvAddFriendPhone.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.ic_unselected_search), null, null, null);
tvAddFriendID.setBackgroundResource(R.drawable.fun_selected_user_bg2);
tvAddFriendPhone.setBackgroundColor(Color.TRANSPARENT);
tvAddFriendID.setTextColor(getResources().getColor(R.color.color_2c2c2c));
tvAddFriendPhone.setTextColor(getResources().getColor(R.color.color_6c707c));
} else {
layoutInputID.setVisibility(View.GONE);
layoutInputPhone.setVisibility(View.VISIBLE);
addFriendEmptyLayout.setVisibility(View.GONE);
layoutUserInfo.setVisibility(View.GONE);
tvAddFriendID.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.ic_unselected_search), null, null, null);
tvAddFriendPhone.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.ic_selected_search), null, null, null);
// tvAddFriendID.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.ic_unselected_search), null, null, null);
// tvAddFriendPhone.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.ic_selected_search), null, null, null);
tvAddFriendPhone.setBackgroundResource(R.drawable.fun_selected_user_bg2);
tvAddFriendID.setBackgroundColor(Color.TRANSPARENT);
tvAddFriendID.setTextColor(getResources().getColor(R.color.color_6c707c));
tvAddFriendPhone.setTextColor(getResources().getColor(R.color.color_2c2c2c));
}
isShowId = showId;
}

2
contactkit-ui/src/main/java/com/netease/yunxin/kit/contactkit/ui/fun/selector/FunContactMembersAdapter.java
View File

@@ -65,7 +65,7 @@ public class FunContactMembersAdapter extends RecyclerView.Adapter<FunContactMem
if (position == 0) {
holder.binding.avatarView.setData(R.drawable.ic_creategroup_add, mContext.getResources().getString(R.string.fun_addmembers_txt));
holder.binding.icClean.setVisibility(View.GONE);
holder.binding.tvName.setTextColor(mContext.getResources().getColor(R.color.color_6d94ff));
holder.binding.tvName.setTextColor(mContext.getResources().getColor(R.color.title_color));
holder.binding.tvName.setText(mContext.getResources().getString(R.string.fun_addmembers_txt));
} else {
holder.binding.tvName.setTextColor(mContext.getResources().getColor(R.color.title_color));

3
contactkit-ui/src/main/java/com/netease/yunxin/kit/contactkit/ui/fun/selector/FunContactSelectorDialog.java
View File

@@ -425,11 +425,14 @@ public class FunContactSelectorDialog extends Dialog {
}
});
binding.tvTeamqr.setOnClickListener(view -> {
dismiss();
if (onTeamQrClickListener != null) {
onTeamQrClickListener.showTeamQR();
}
});
binding.tvTeamurl.setOnClickListener(view -> {
dismiss();
if (onTeamQrClickListener != null) {
onTeamQrClickListener.showTeamUrl();
}

BIN
contactkit-ui/src/main/res-fun/drawable-xxhdpi/ic_creategroup_add.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

10
contactkit-ui/src/main/res-fun/drawable/fun_selected_user_bg1.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="20dp"/>
<solid android:color="#EEF0F7"/>
</shape>

10
contactkit-ui/src/main/res-fun/drawable/fun_selected_user_bg11.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="23dp"/>
<solid android:color="#EEF0F7"/>
</shape>

10
contactkit-ui/src/main/res-fun/drawable/fun_selected_user_bg2.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 NetEase, Inc. All rights reserved.
~ Use of this source code is governed by a MIT license that can be
~ found in the LICENSE file.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="19dp"/>
<solid android:color="#FFFFFF"/>
</shape>

231
contactkit-ui/src/main/res-fun/layout/fun_add_friend_activity.xml
View File

@@ -54,33 +54,42 @@
android:background="@color/color_f7f7f7"
app:layout_constraintTop_toBottomOf="@+id/layout_add_friend_title" />
<TextView
android:id="@+id/tv_searchfriend_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen_15_dp"
android:drawableStart="@drawable/ic_selected_search"
android:drawablePadding="@dimen/dimen_10_dp"
android:paddingTop="@dimen/dimen_30_dp"
android:text="@string/lailiaozhanghao_txt"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_14"
<LinearLayout
android:id="@+id/tag_accessibility_actions"
android:layout_width="232dp"
android:layout_height="40dp"
android:layout_marginTop="@dimen/dimen_15_dp"
android:background="@drawable/fun_selected_user_bg1"
android:orientation="horizontal"
android:padding="2dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line_searchfriend_top" />
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line_searchfriend_top">
<TextView
android:id="@+id/tv_searchfriend_id"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/fun_selected_user_bg2"
android:gravity="center"
android:text="遇聊账号"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/text_size_14"
app:layout_constraintLeft_toLeftOf="parent" />
<!-- @string/lailiaozhanghao_txt-->
<TextView
android:id="@+id/tv_searchfriend_phone"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="电话号码"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_14" />
<!-- @string/addfriends_phone-->
</LinearLayout>
<TextView
android:id="@+id/tv_searchfriend_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen_60_dp"
android:drawableStart="@drawable/ic_unselected_search"
android:drawablePadding="@dimen/dimen_10_dp"
android:paddingTop="@dimen/dimen_30_dp"
android:text="@string/addfriends_phone"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_14"
app:layout_constraintLeft_toRightOf="@+id/tv_searchfriend_id"
app:layout_constraintTop_toBottomOf="@+id/line_searchfriend_top" />
<!--Demo 布局-->
<LinearLayout
@@ -90,32 +99,40 @@
android:layout_marginLeft="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_30_dp"
android:layout_marginRight="@dimen/dimen_15_dp"
android:background="@drawable/fun_selected_user_bg"
android:background="@drawable/fun_selected_user_bg1"
android:gravity="center"
android:orientation="horizontal"
android:visibility="visible"
app:layout_constraintTop_toBottomOf="@id/tv_searchfriend_id"
app:layout_constraintTop_toBottomOf="@id/tag_accessibility_actions"
tools:ignore="MissingConstraints">
<ImageView
android:id="@+id/iv_friendaccount_search"
android:layout_width="@dimen/dimen_16_dp"
android:layout_height="@dimen/dimen_16_dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dimen_12_dp"
android:layout_marginRight="@dimen/dimen_10_dp"
android:src="@mipmap/ic_search" />
<EditText
android:id="@+id/et_add_friend_account"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dimen_15_dp"
android:layout_weight="1"
android:background="@null"
android:hint="@string/add_friend_searchid_hint"
android:imeOptions="actionSearch"
android:singleLine="true"
android:textColorHint="@color/color_d4dbd6"
android:textColor="@color/color_2c2c2c"
android:textColorHint="#BCBCBC"
android:textCursorDrawable="@null"
android:textSize="@dimen/text_size_14" />
<ImageView
android:id="@+id/iv_friendaccount_clear"
android:layout_width="@dimen/dimen_12_dp"
android:layout_height="@dimen/dimen_12_dp"
android:layout_width="@dimen/dimen_16_dp"
android:layout_height="@dimen/dimen_16_dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dimen_12_dp"
android:layout_marginRight="@dimen/dimen_12_dp"
@@ -123,15 +140,6 @@
android:visibility="gone" />
<ImageView
android:id="@+id/iv_friendaccount_search"
android:layout_width="@dimen/dimen_12_dp"
android:layout_height="@dimen/dimen_12_dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dimen_12_dp"
android:layout_marginRight="@dimen/dimen_15_dp"
android:src="@mipmap/ic_search" />
</LinearLayout>
@@ -139,17 +147,28 @@
<RelativeLayout
android:id="@+id/ly_searchfriend_inputphone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/dimen_40_dp"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_30_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:background="@drawable/fun_selected_user_bg1"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@+id/tv_searchfriend_id">
app:layout_constraintTop_toBottomOf="@+id/tag_accessibility_actions">
<ImageView
android:id="@+id/iv_friendphone_search"
android:layout_width="@dimen/dimen_16_dp"
android:layout_height="@dimen/dimen_16_dp"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/dimen_12_dp"
android:layout_marginRight="@dimen/dimen_10_dp"
android:src="@mipmap/ic_search" />
<TextView
android:id="@+id/area_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dimen_50_dp"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:paddingEnd="@dimen/dimen_10_dp"
android:text=" +886"
@@ -160,7 +179,8 @@
<EditText
android:id="@+id/phone_et"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_50_dp"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:layout_toRightOf="@+id/area_tv"
android:background="@null"
android:hint="@string/add_friend_searchphone_hint"
@@ -168,36 +188,23 @@
android:inputType="text"
android:paddingLeft="@dimen/dimen_20_dp"
android:singleLine="true"
android:textColor="@color/color_333333"
android:textColor="@color/color_2c2c2c"
android:textColorHint="@color/color_bcbcbc"
android:textCursorDrawable="@null"
android:textSize="@dimen/text_size_18" />
<ImageView
android:id="@+id/iv_friend_clear"
android:layout_width="@dimen/dimen_12_dp"
android:layout_height="@dimen/dimen_12_dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/dimen_30_dp"
android:src="@drawable/ic_clear"
android:visibility="gone" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_friendphone_search"
android:layout_width="@dimen/dimen_16_dp"
android:layout_height="@dimen/dimen_16_dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
app:srcCompat="@mipmap/ic_search_edit" />
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:src="@drawable/ic_clear"
android:visibility="gone" />
<View
android:id="@+id/line_searchfriend_phone"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_1_dp"
android:layout_below="@+id/phone_et"
android:background="@color/color_d8d8d8" />
</RelativeLayout>
@@ -206,54 +213,74 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_163_dp"
android:layout_marginTop="102dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_searchfriend_phone">
app:layout_constraintTop_toBottomOf="@+id/tag_accessibility_actions">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#EEF0F4" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_56_dp"
android:layout_marginTop="@dimen/dimen_15_dp"
android:orientation="horizontal">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/av_indexfra_head"
android:layout_width="@dimen/dimen_56_dp"
android:layout_height="match_parent"
app:avatarCorner="@dimen/dimen_64_dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginStart="@dimen/dimen_10_dp"
android:layout_marginEnd="@dimen/dimen_10_dp"
android:orientation="vertical">
<TextView
android:id="@+id/tv_username"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:textColor="@color/color_2c2c2c"
android:textSize="@dimen/text_size_18"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleBarView" />
<TextView
android:id="@+id/tv_usertips"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:textColor="#882c2c2c"
android:textSize="@dimen/text_size_14"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent" />
</LinearLayout>
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/av_indexfra_head"
android:layout_width="@dimen/dimen_64_dp"
android:layout_height="@dimen/dimen_64_dp"
app:avatarCorner="@dimen/dimen_64_dp" />
<TextView
android:id="@+id/tv_userinfohint"
android:layout_width="@dimen/dimen_58_dp"
android:layout_height="@dimen/dimen_32_dp"
android:layout_gravity="center_vertical"
android:background="@drawable/cornor_6d94ff_20dp"
android:gravity="center"
android:text="@string/add_friend_search_result"
android:textColor="@color/color_white"
android:textSize="@dimen/text_size_14" />
</LinearLayout>
<TextView
android:id="@+id/tv_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_10_dp"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_18"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/titleBarView" />
<TextView
android:id="@+id/tv_usertips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_5_dp"
android:textColor="@color/color_7e7b84"
android:textSize="@dimen/text_size_14"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent" />
<TextView
android:id="@+id/tv_userinfohint"
android:layout_width="@dimen/dimen_58_dp"
android:layout_height="@dimen/dimen_32_dp"
android:layout_marginTop="@dimen/dimen_20_dp"
android:background="@drawable/cornor_6d94ff_20dp"
android:gravity="center"
android:text="@string/add_friend_search_result"
android:textColor="@color/color_white"
android:textSize="@dimen/text_size_14" />
</LinearLayout>
<LinearLayout

25
contactkit-ui/src/main/res-fun/layout/fun_black_list_view_holder.xml
View File

@@ -8,16 +8,17 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/root_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="86dp"
android:background="@color/color_white"
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/avatar_view"
android:layout_width="@dimen/dimen_40_dp"
android:layout_height="@dimen/dimen_40_dp"
android:layout_width="@dimen/dimen_56_dp"
android:layout_height="@dimen/dimen_56_dp"
android:layout_marginTop="@dimen/dimen_12_dp"
android:layout_marginBottom="@dimen/dimen_12_dp"
android:layout_marginStart="@dimen/dimen_20_dp"
android:layout_marginStart="@dimen/dimen_45_dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
@@ -27,8 +28,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen_12_dp"
android:textSize="@dimen/text_size_17"
android:textColor="@color/color_14131b"
android:textSize="@dimen/text_size_18"
android:textColor="@color/color_2c2c2c"
android:maxLines="1"
android:ellipsize="end"
app:layout_constrainedWidth="true"
@@ -59,20 +60,22 @@
style="@style/FunSelectorRadioBtn"
android:layout_width="@dimen/dimen_18_dp"
android:layout_height="@dimen/dimen_18_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:layout_marginStart="@dimen/dimen_15_dp"
android:clickable="false"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:visibility="visible" />
<View
android:layout_width="0dp"
android:layout_height="@dimen/dimen_1_dp"
android:visibility="gone"
android:background="@color/color_e5e5e5"
app:layout_constraintStart_toStartOf="@+id/avatar_view"
android:visibility="visible"
android:background="#EEF0F4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

166
contactkit-ui/src/main/res-fun/layout/fun_contact_selector_setting_activity.xml
View File

@@ -18,8 +18,8 @@
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/ic_grouphead"
android:layout_width="@dimen/dimen_88_dp"
android:layout_height="@dimen/dimen_88_dp"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_marginTop="@dimen/dimen_20_dp"
app:avatarCorner="@dimen/dimen_88_dp"
app:layout_constraintEnd_toEndOf="parent"
@@ -28,11 +28,12 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_groupheadtop"
android:layout_width="@dimen/dimen_88_dp"
android:layout_height="@dimen/dimen_88_dp"
android:layout_width="80dp"
android:layout_height="80dp"
app:layout_constraintBottom_toBottomOf="@+id/ic_grouphead"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:background="@mipmap/default_head_img_group"
app:srcCompat="@mipmap/ic_grouphead_setting" />
<TextView
@@ -55,16 +56,20 @@
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_20_dp"
android:text="@string/fun_creategroup_name"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_14"
android:textColor="#2C2C2C"
android:textSize="@dimen/text_size_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_grouphead" />
<LinearLayout
android:id="@+id/llgroupname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/dimen_58_dp"
android:orientation="horizontal"
android:background="@drawable/cornor_stroke_thempink_gray"
android:layout_marginTop="@dimen/dimen_15_dp"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tvgroup_tipsname"
app:layout_constraintTop_toBottomOf="@+id/tvgroup_tipsname">
@@ -72,84 +77,32 @@
<EditText
android:id="@+id/edit_groupname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_20_dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:layout_marginStart="@dimen/dimen_5_dp"
android:layout_weight="0.9"
android:background="@null"
android:ellipsize="end"
android:maxLength="20"
android:maxLines="1"
android:background="@null"
android:paddingLeft="@dimen/dimen_15_dp"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_bcbcbc"
android:textColor="#2c2c2c"
android:textColorHint="#BCBCBC"
android:textSize="@dimen/text_size_16" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ic_clean_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginEnd="@dimen/dimen_10_dp"
android:layout_height="match_parent"
android:scaleType="centerInside"
android:layout_gravity="center_vertical"
android:layout_weight="0.1"
android:paddingTop="@dimen/dimen_20_dp"
android:visibility="gone"
app:srcCompat="@drawable/ic_selector_close" />
</LinearLayout>
<View
android:id="@+id/line_top"
android:layout_width="0dp"
android:layout_height="@dimen/dimen_1_dp"
android:layout_marginTop="@dimen/dimen_15_dp"
android:background="@color/color_d8d8d8"
app:layout_constraintEnd_toEndOf="@+id/llgroupname"
app:layout_constraintStart_toStartOf="@+id/llgroupname"
app:layout_constraintTop_toBottomOf="@+id/llgroupname" />
<TextView
android:id="@+id/tvgroup_autojoin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_28_dp"
android:text="@string/fun_creategroup_autojoin"
android:textColor="@color/color_333333"
android:textSize="@dimen/text_size_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line_top" />
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/rb_selector"
style="@style/FunSelectorRadioBtn"
android:layout_width="@dimen/dimen_20_dp"
android:layout_height="@dimen/dimen_20_dp"
android:layout_marginTop="@dimen/dimen_28_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:checked="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line_top" />
<View
android:id="@+id/rb_clickview"
android:layout_width="@dimen/dimen_60_dp"
android:layout_height="@dimen/dimen_60_dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/line_top" />
<TextView
android:id="@+id/tvgroup_autojoin_tips"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_10_dp"
android:layout_marginEnd="@dimen/dimen_50_dp"
android:text="@string/fun_creategroup_autojoin_tips"
android:textColor="@color/color_7f7b81"
android:textSize="@dimen/text_size_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tvgroup_autojoin"
app:layout_constraintTop_toBottomOf="@+id/tvgroup_autojoin" />
<TextView
android:id="@+id/tvgroup_addFriends"
@@ -158,10 +111,10 @@
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_28_dp"
android:text="@string/fun_creategroup_allowaddfriends"
android:textColor="@color/color_333333"
android:textColor="#2C2C2C"
android:textSize="@dimen/text_size_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvgroup_autojoin_tips" />
app:layout_constraintTop_toBottomOf="@+id/llgroupname" />
<androidx.appcompat.widget.SwitchCompat
@@ -176,16 +129,87 @@
app:layout_constraintTop_toTopOf="@+id/tvgroup_addFriends"
app:track="@drawable/switch_track_selector" />
<View
android:id="@+id/add_vvv"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#EEF0F4"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_21_dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvgroup_addFriends"
/>
<TextView
android:id="@+id/tvgroup_autojoin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_21_dp"
android:text="@string/fun_creategroup_autojoin"
android:textColor="#2C2C2C"
android:textSize="@dimen/text_size_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/add_vvv" />
<androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/rb_selector"
style="@style/FunSelectorRadioBtn1"
android:layout_width="@dimen/dimen_46_dp"
android:layout_height="@dimen/dimen_24_dp"
android:layout_marginTop="@dimen/dimen_21_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:checked="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/add_vvv" />
<View
android:id="@+id/rb_clickview"
android:layout_width="@dimen/dimen_60_dp"
android:layout_height="@dimen/dimen_60_dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/add_vvv" />
<TextView
android:id="@+id/tvgroup_autojoin_tips"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dimen_10_dp"
android:layout_marginEnd="@dimen/dimen_50_dp"
android:text="@string/fun_creategroup_autojoin_tips"
android:textColor="#2C2C2C"
android:textSize="@dimen/text_size_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tvgroup_autojoin"
app:layout_constraintTop_toBottomOf="@+id/tvgroup_autojoin" />
<View
android:id="@+id/add_vvvv"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#EEF0F4"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_21_dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvgroup_autojoin_tips"
/>
<TextView
android:id="@+id/tvgroup_members"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_30_dp"
android:textColor="@color/color_333333"
android:textColor="#2C2C2C"
android:textSize="@dimen/text_size_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvgroup_addFriends" />
app:layout_constraintTop_toBottomOf="@+id/add_vvvv" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_members"

6
contactkit-ui/src/main/res-fun/layout/fun_friend_selected_view_holder.xml
View File

@@ -13,9 +13,9 @@
<com.netease.yunxin.kit.common.ui.widgets.ContactAvatarView
android:id="@+id/avatar_view"
android:layout_width="@dimen/dimen_45_dp"
android:layout_height="@dimen/dimen_45_dp"
app:avatarCorner="@dimen/dimen_45_dp"
android:layout_width="@dimen/dimen_48_dp"
android:layout_height="@dimen/dimen_48_dp"
app:avatarCorner="@dimen/dimen_48_dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />

3
contactkit-ui/src/main/res-fun/values/colors.xml
View File

@@ -9,4 +9,7 @@
<color name="fun_contact_search_item_nick_color">#333333</color>
<color name="fun_contact_search_item_name_color">#666666</color>
<color name="fun_contact_list_item_hint_color">#7F7B81</color>
<color name="color_6c707c">#6C707C</color>
<color name="color_2c2c2c">#2C2C2C</color>
</resources>

5
contactkit-ui/src/main/res-fun/values/styles.xml
View File

@@ -10,7 +10,10 @@
<item name="android:button">@null</item>
<item name="android:background">@drawable/fun_radio_button_selector</item>
</style>
<style name="FunSelectorRadioBtn1" parent="Widget.AppCompat.CompoundButton.RadioButton">
<item name="android:button">@null</item>
<item name="android:background">@drawable/fun_radio_button_selector1</item>
</style>
<style name="SelectorFriendsBottomDialogTheme" parent="ThemeOverlay.AppCompat.Dialog">
<!-- 背景透明 -->
<item name="android:windowBackground">@android:color/transparent</item>

6
contactkit-ui/src/main/res/drawable/cornor_stroke_thempink_gray.xml Normal file
View File

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

11
contactkit-ui/src/main/res/drawable/fun_radio_button_selector1.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?><!-- Copyright (c) 2022 NetEase, Inc. All rights reserved. -->
<!-- Use of this source code is governed by a MIT license that can be -->
<!-- found in the LICENSE file. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/fun_ic_selected_conversation1" android:state_checked="true" />
<item android:drawable="@mipmap/fun_ic_unselector_conversation1" android:state_checked="false" />
</selector>

2
contactkit-ui/src/main/res/drawable/switch_track_on.xml
View File

@@ -14,6 +14,6 @@
android:width="@dimen/dimen_44_dp"
android:height="@dimen/dimen_24_dp" />
<solid android:color="@color/color_09bb07" />
<solid android:color="#498AFA" />
</shape>

24
contactkit-ui/src/main/res/drawable/user_true1.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="#B1B1B1">
<item android:id="@android:id/mask">
<shape>
<solid android:color="#889CBC" />
</shape>
</item>
<!-- 默认显⽰效果-->
<item>
<shape android:shape="rectangle">
<gradient
android:angle="90"
android:endColor="#EEF0F7"
android:startColor="#FFFFFF"
android:type="linear"
android:centerColor="#EEF0F7"
android:useLevel="true" />
</shape>
</item>
</ripple>

52
contactkit-ui/src/main/res/layout/base_list_activity_layout.xml
View File

@@ -8,59 +8,48 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_white"
android:background="@drawable/user_true1"
android:orientation="vertical">
<com.netease.yunxin.kit.common.ui.widgets.BackTitleBar
android:id="@+id/title"
android:background="@color/color_white"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="?actionBarSize" />
<TextView
android:id="@+id/tv_Tips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dimen_15_dp"
android:layout_marginVertical="@dimen/dimen_4_dp"
android:lineSpacingExtra="@dimen/dimen_5_dp"
android:textColor="@color/color_999999"
android:textSize="@dimen/text_size_14"
android:visibility="gone" />
<TextView
android:id="@+id/heimindan_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_40_dp"
android:layout_marginTop="@dimen/dimen_10_dp"
android:text="@string/black_list"
android:textColor="#ff333333"
android:textColor="@color/color_2c2c2c"
android:textSize="14sp"
android:visibility="gone" />
<com.netease.yunxin.kit.contactkit.ui.view.ContactListView
android:id="@+id/contact_listView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"
android:layout_weight="0.9"
android:background="@android:color/white"
android:layout_height="wrap_content"
android:background="@color/color_white"
android:layout_marginTop="@dimen/dimen_10_dp"
app:showIndexBar="false" />
<LinearLayout
android:id="@+id/layoutEmpty"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.9"
android:background="@android:color/white"
android:layout_height="290dp"
android:gravity="center"
android:orientation="vertical"
android:layout_marginTop="@dimen/dimen_10_dp"
android:background="@color/color_white"
android:visibility="gone">
<ImageView
android:layout_width="@dimen/dimen_100_dp"
android:layout_height="@dimen/dimen_100_dp"
android:layout_width="128dp"
android:layout_height="128dp"
android:layout_gravity="center_horizontal"
android:src="@mipmap/ic_nodate" />
@@ -69,14 +58,27 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textSize="16sp"
android:layout_marginTop="20dp"
android:textColor="@color/color_999999"
android:text="@string/nodate_txt" />
</LinearLayout>
<TextView
android:id="@+id/tv_Tips"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dimen_15_dp"
android:lineSpacingExtra="@dimen/dimen_5_dp"
android:textColor="#FF4646"
android:layout_marginTop="@dimen/dimen_15_dp"
android:textSize="@dimen/text_size_16"
android:visibility="gone" />
<TextView
android:id="@+id/tv_blackremove"
android:layout_width="match_parent"
android:layout_height="@dimen/dimen_40_dp"
android:layout_height="@dimen/dimen_52_dp"
android:layout_marginStart="@dimen/dimen_15_dp"
android:layout_marginTop="@dimen/dimen_20_dp"
android:layout_marginEnd="@dimen/dimen_15_dp"

BIN
contactkit-ui/src/main/res/mipmap/default_head_img.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
contactkit-ui/src/main/res/mipmap/default_head_img_group.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
contactkit-ui/src/main/res/mipmap/fun_ic_selected_conversation1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
contactkit-ui/src/main/res/mipmap/fun_ic_unselector_conversation1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
contactkit-ui/src/main/res/mipmap/ic_nodate.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
contactkit-ui/src/main/res/mipmap/ic_search.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 516 B

After

Width:  |  Height:  |  Size: 2.2 KiB

10
contactkit-ui/src/main/res/values-zh/strings.xml
View File

@@ -33,7 +33,7 @@
<string name="direct_add_your_friend_apply">直接添加你为好友</string>
<string name="reject_your_friend_apply">拒绝了你的好友请求</string>
<string name="verify_msg">验证消息</string>
<string name="activity_msg">推送通知</string>
<string name="activity_msg">通知</string>
<string name="verify_max_count_text">99+</string>
<string name="verify_agree_message_text">我已经同意了你的申请，现在开始聊天吧~</string>
<string name="verify_empty_text">暂无好友申请信息</string>
@@ -124,14 +124,14 @@
<string name="fun_contact_remarks_tips">请输入备注</string>
<string name="fun_contact_addfriends_send">发送</string>
<string name="fun_contact_createteam_tips">使用名称进行搜索</string>
<string name="fun_creategroup_members">成员 %d</string>
<string name="fun_creategroup_members">成员（%d）</string>
<string name="fun_creategroup_uploadhead">上传头像</string>
<string name="fun_creategroup_autojoin_tips">用户在收到邀请后就会加入群组，关闭此设定后要求成员加入群组需手动接受邀请。</string>
<string name="fun_creategroup_autojoin">用户自动加入</string>
<string name="fun_creategroup_allowaddfriends">是否允许群内添加好友</string>
<string name="fun_creategroup_name">群组名称</string>
<string name="fun_creategroup_title">设定群组档案</string>
<string name="fun_creategroup_sure">建立</string>
<string name="fun_creategroup_name">群名称</string>
<string name="fun_creategroup_title">设定群组信息</string>
<string name="fun_creategroup_sure">创建</string>
<string name="fun_contactselector_last">最近联系 %d</string>
<string name="fun_contactselector_mylove">特别关注 %d</string>
<string name="fun_contactselector_members">全部好友 %d</string>

2
contactkit-ui/src/main/res/values/dimens.xml
View File

@@ -43,7 +43,7 @@
<dimen name="dimen_56_dp">56dp</dimen>
<dimen name="dimen_60_dp">60dp</dimen>
<dimen name="dimen_64_dp">64dp</dimen>
<dimen name="dimen_88_dp">64dp</dimen>
<dimen name="dimen_88_dp">88dp</dimen>
<dimen name="dimen_100_dp">100dp</dimen>
<dimen name="dimen_115_dp">115dp</dimen>
<dimen name="dimen_118_dp">118dp</dimen>