androidOne/qianyanAndroid
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改动态和部分我的界面

Browse Source
This commit is contained in:
被淹死的鱼
2026-03-17 20:24:06 +08:00
parent 48f01f0942
commit b03b04dad5
1166 changed files with 10063 additions and 6325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 93 KiB

6
app/src/main/res/drawable/bg_efecec.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:endColor="#EFECEC"
android:startColor="#EFECEC"/>
<corners android:radius="8dp"/>
</shape>

6
app/src/main/res/drawable/bg_fff_t50.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
<gradient android:endColor="#80FFFFFF"
android:startColor="#80FFFFFF"/>
<corners android:radius="50dp"/>
</shape>

11
app/src/main/res/drawable/bg_focus.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:angle="0"
android:startColor="#E236B5"
android:endColor="#E9413C"/>
<corners android:radius="@dimen/dp45"/>
</shape>

11
app/src/main/res/drawable/bg_level.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:angle="0"
android:startColor="#65DAEC"
android:endColor="#6FF0B7"/>
<corners android:radius="@dimen/dp45"/>
</shape>

9
app/src/main/res/drawable/shape_button_e472ed.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:color="#EA6FEE" android:width="@dimen/dp1"/>
<solid android:color="#EA6FEE"/>
<corners android:radius="@dimen/dp45"/>
</shape>

8
app/src/main/res/drawable/shape_button_e472ed_t10.xml Normal file
View File

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

7
app/src/main/res/drawable/shape_f9fafc_bg_r14.xml Normal file
View File

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

20
app/src/main/res/drawable/shape_personal_main_start_audio_button.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="true">
<shape android:shape="rectangle">
<gradient android:angle="0"
android:startColor="#AC38F3"
android:endColor="#D07BF7"/>
<corners android:radius="45dp"/>
</shape>
</item>
<item android:state_enabled="false">
<shape android:shape="rectangle">
<solid android:color="@color/loginText2"/>
<corners android:radius="45dp"/>
</shape>
</item>
</selector>

4
app/src/main/res/drawable/shape_personal_main_start_video_button.xml
View File

@@ -3,8 +3,8 @@
<item android:state_enabled="true">
<shape android:shape="rectangle">
<gradient android:angle="0"
android:startColor="#E69EFF"
android:endColor="#925BF7"/>
android:startColor="#EA6FEE"
android:endColor="#EB6969"/>
<corners android:radius="45dp"/>
</shape>

4
app/src/main/res/drawable/shape_rechargeitem_normal_background.xml
View File

@@ -3,7 +3,7 @@
android:shape="rectangle">
<corners android:radius="4dp"/>
<solid android:color="@android:color/white"/>
<stroke android:color="#D1D2D9" android:width="1dp"></stroke>
<solid android:color="#F4F4F4"/>
<stroke android:color="#F4F4F4" android:width="1dp"></stroke>
</shape>

4
app/src/main/res/drawable/shape_rechargeitem_selected_background.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="4dp"/>
<stroke android:color="#F24C43" android:width="1dp"></stroke>
<solid android:color="#FFEDEE"/>
<stroke android:color="#E472ED" android:width="1dp" />
<solid android:color="#FCF2FD"/>
</shape>

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

@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="147dp"
android:text="私语"
android:text="芊颜"
android:textColor="@color/loginText2"
android:textSize="17sp" />
@@ -70,7 +70,7 @@
android:id="@+id/about_contract_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="《私语用户协议》"
android:text="《芊颜用户协议》"
android:textColor="@color/mainColor" />
<TextView
@@ -78,7 +78,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:text="《私语隐私保护》"
android:text="《芊颜隐私保护》"
android:textColor="@color/mainColor" />
</LinearLayout>

57
app/src/main/res/layout/activity_caibei_recharge.xml
View File

@@ -4,40 +4,71 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/mainBg"
android:background="@color/white"
android:orientation="vertical"
tools:viewBindingIgnore="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/mainBg">
android:background="@color/white">
<RelativeLayout
android:id="@+id/caibei_recharge_title"
android:layout_width="match_parent"
android:layout_height="118dp"
android:layout_height="@dimen/dp64"
android:layout_marginHorizontal="@dimen/dp20"
android:background="@color/white">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/sv_avatar"
android:layout_width="@dimen/dp34"
android:layout_height="@dimen/dp34"
android:layout_centerVertical="true"
app:roundAsCircle="true"
/>
<TextView
android:id="@+id/tv_nikename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_centerVertical="true"
android:text="团员的秋刀鱼"
android:textSize="13dp"
android:layout_toRightOf="@+id/sv_avatar"
android:textColor="@color/black"/>
<ImageView
android:id="@+id/iv_img"
android:layout_width="@dimen/dp22"
android:layout_height="@dimen/dp22"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:src="@mipmap/ic_gold_img"/>
<TextView
android:id="@+id/caibei_recharge_pay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:layout_centerVertical="true"
android:text="0"
android:textColor="#680ad2"
android:textSize="32sp" />
android:textColor="#FFC62F"
android:layout_toLeftOf="@+id/iv_img"
android:layout_marginRight="@dimen/dp5"
android:textStyle="bold"
android:textSize="20dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/caibei_recharge_pay"
android:layout_centerInParent="true"
android:layout_marginTop="12dp"
android:text="总金币"
android:textColor="@color/two_text"
android:textSize="14sp" />
android:layout_toLeftOf="@+id/caibei_recharge_pay"
android:layout_centerVertical="true"
android:text="金额："
android:layout_marginRight="@dimen/dp10"
android:textColor="@color/black"
android:textSize="13sp" />
</RelativeLayout>
<LinearLayout

50
app/src/main/res/layout/activity_dynamic_detail_two.xml Normal file
View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
tools:context=".view.dynamics.activity.DynamicDetailTwoActivity">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp10"
android:layout_marginTop="@dimen/dp20"
android:background="#F6F7FB"/>
<LinearLayout
android:id="@+id/ll_go_commend"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp20"
android:layout_marginTop="@dimen/dp20"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_commend_count"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="#000000"
android:textSize="@dimen/dp14"
android:text="用户评价(0)"/>
<ImageView
android:layout_width="@dimen/dp18"
android:layout_height="@dimen/dp18"
android:src="@mipmap/girlauth_right"/>
</LinearLayout>
</LinearLayout>

45
app/src/main/res/layout/activity_dynamic_post.xml
View File

@@ -8,6 +8,51 @@
<include layout="@layout/item_edit"/>
<RelativeLayout
android:id="@+id/rl_add_topic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp20"
android:layout_marginTop="@dimen/dp15"
android:layout_marginBottom="@dimen/dp20"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp14"
android:textColor="@color/black"
android:textStyle="bold"
android:text="选择话题"/>
<ImageView
android:id="@+id/iv_right"
android:layout_width="@dimen/dp18"
android:layout_height="@dimen/dp18"
android:layout_alignParentRight="true"
android:src="@mipmap/girlauth_right"/>
<TextView
android:id="@+id/tv_topic_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#999999"
android:textSize="@dimen/dp14"
android:layout_toLeftOf="@+id/iv_right"
android:text="添加话题"/>
<ImageView
android:layout_width="@dimen/dp14"
android:layout_height="@dimen/dp14"
android:layout_toLeftOf="@+id/tv_topic_content"
android:layout_marginRight="@dimen/dp6"
android:layout_centerVertical="true"
android:src="@mipmap/ic_topic_small"/>
</RelativeLayout>
<LinearLayout
android:id="@+id/dynamics_post_line_1"
android:layout_width="match_parent"

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.fengliyan.tianlesue.view.dynamics.activity.FixLayoutLinearlayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.xuebiping.bolizhuzi.view.dynamics.activity.FixLayoutLinearlayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -70,4 +70,4 @@
android:textSize="14sp" />
</LinearLayout>
</com.fengliyan.tianlesue.view.dynamics.activity.FixLayoutLinearlayout>
</com.xuebiping.bolizhuzi.view.dynamics.activity.FixLayoutLinearlayout>

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

@@ -296,7 +296,7 @@
android:id="@+id/tv_vip_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="《私语会员服务协议》"
android:text="《芊颜会员服务协议》"
android:textColor="@color/mainColors"
android:textSize="14dp"
android:textStyle="bold" />

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

@@ -5,7 +5,7 @@
tools:viewBindingIgnore="true"
android:layout_height="match_parent">
<com.fengliyan.tianlesue.view.diooto.tools.NoScrollViewPager
<com.xuebiping.bolizhuzi.view.diooto.tools.NoScrollViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"

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

@@ -30,7 +30,7 @@
android:textSize="17sp"
/>
<com.fengliyan.tianlesue.utils.CaptchaInputView
<com.xuebiping.bolizhuzi.utils.CaptchaInputView
android:layout_centerHorizontal="true"
android:layout_below="@+id/tv_password"
android:id="@+id/captcha_input_view"

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

@@ -30,7 +30,7 @@
android:textSize="17sp"
/>
<com.fengliyan.tianlesue.utils.CaptchaInputView
<com.xuebiping.bolizhuzi.utils.CaptchaInputView
android:layout_centerHorizontal="true"
android:layout_below="@+id/tv_password"
android:id="@+id/captcha_input_view"

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

@@ -30,7 +30,7 @@
android:textSize="17sp"
/>
<com.fengliyan.tianlesue.utils.CaptchaInputView
<com.xuebiping.bolizhuzi.utils.CaptchaInputView
android:layout_centerHorizontal="true"
android:layout_below="@+id/tv_password"
android:id="@+id/captcha_input_view"

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

@@ -450,7 +450,7 @@
android:id="@+id/login_contract_titile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="《私语用户协议》"
android:text="《芊颜用户协议》"
android:textColor="@color/mainColors"
android:textSize="12sp"
android:textStyle="bold" />
@@ -467,7 +467,7 @@
android:id="@+id/about_contract_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="《私语隐私政策》"
android:text="《芊颜隐私政策》"
android:textColor="@color/mainColors"
android:textSize="12sp"
android:textStyle="bold" />

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

@@ -118,7 +118,7 @@
android:id="@+id/login_contract_titile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="《私语用户协议》"
android:text="《芊颜用户协议》"
android:textColor="@color/mainColors"
android:textSize="12sp"
android:textStyle="bold" />
@@ -135,7 +135,7 @@
android:id="@+id/about_contract_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="《私语隐私政策》"
android:text="《芊颜隐私政策》"
android:textColor="@color/mainColors"
android:textSize="12sp"
android:textStyle="bold" />

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

@@ -51,7 +51,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:text="私语1387739"
android:text="芊颜1387739"
android:textColor="#ffffffff"
android:textSize="14sp" />

77
app/src/main/res/layout/activity_main_personal_page.xml
View File

@@ -37,7 +37,7 @@
android:visibility="gone">
<LinearLayout
android:id="@+id/main_personal_page_message"
android:id="@+id/main_personal_page_gift"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="16dp"
@@ -45,6 +45,29 @@
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/userhome_gift" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp5"
android:text="礼物"
android:textColor="@color/black"
android:textSize="10dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/main_personal_page_message"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -54,31 +77,9 @@
android:id="@+id/main_personal_page_message_private"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginTop="@dimen/dp5"
android:text="私信"
android:textColor="@color/cp_color_gray_deep"
android:textSize="10dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/main_personal_page_gift"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/userhome_gift" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="礼物"
android:textColor="@color/cp_color_gray_deep"
android:textColor="@color/black"
android:textSize="10dp" />
</LinearLayout>
@@ -89,7 +90,8 @@
android:layout_marginEnd="20dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/iv_follow"
@@ -130,6 +132,25 @@
android:textSize="10dp" />
</LinearLayout>
<TextView
android:id="@+id/main_personal_page_audio_button"
android:layout_width="wrap_content"
android:layout_height="44dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:layout_marginEnd="28dp"
android:layout_weight="1"
android:background="@drawable/shape_personal_main_start_audio_button"
android:drawableStart="@mipmap/ic_details_audio"
android:gravity="center"
android:paddingLeft="22dp"
android:paddingRight="22dp"
android:text="匿名语音"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="gone" />
<TextView
android:id="@+id/main_personal_page_video_button"
android:layout_width="wrap_content"
@@ -139,11 +160,11 @@
android:layout_marginEnd="28dp"
android:layout_weight="1"
android:background="@drawable/shape_personal_main_start_video_button"
android:drawableStart="@drawable/ic_details_video"
android:drawableStart="@mipmap/ic_details_video"
android:gravity="center"
android:paddingLeft="22dp"
android:paddingRight="22dp"
android:text="与Ta通话"
android:text="匿名视频"
android:textColor="@color/white"
android:textSize="16sp"
android:visibility="gone" />

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

@@ -3,13 +3,15 @@
android:orientation="vertical" android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/white">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_marginTop="16dp"
android:background="@android:color/white">
android:layout_marginTop="@dimen/dp20"
android:background="@drawable/shape_f9fafc_bg_r14"
android:layout_marginHorizontal="@dimen/dp20">
<EditText
android:maxLength="10"
android:id="@+id/nick_name_edit_input"

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

@@ -32,7 +32,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="玩转私语"
android:text="玩转芊颜"
android:textSize="14sp"
android:textColor="@color/loginText"/>
</LinearLayout>

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

@@ -30,7 +30,7 @@
android:id="@+id/notification_chat_button_1"
android:layout_width="match_parent"
android:layout_height="46dp"
android:text="玩转私语"
android:text="玩转芊颜"
android:textColor="@android:color/black"
android:textSize="14sp"
android:gravity="center"

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

@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:background="@color/black">
<com.fengliyan.tianlesue.view.main.ui.EmptyControlVideo
<com.xuebiping.bolizhuzi.view.main.ui.EmptyControlVideo
android:id="@+id/videoView"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -143,7 +143,7 @@
android:layout_marginBottom="30dp"
android:background="@drawable/shape_home_progress" />
<com.fengliyan.tianlesue.utils.ProgressView
<com.xuebiping.bolizhuzi.utils.ProgressView
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="8dp"

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

@@ -84,7 +84,7 @@
android:layout_marginLeft="12dp"
android:layout_marginTop="20dp"
android:layout_marginRight="12dp"
android:text="1.认证信息仅用于实名认证，私语会严格保密"
android:text="1.认证信息仅用于实名认证，芊颜会严格保密"
android:textColor="@color/three_text"
android:textSize="12sp" />

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

@@ -200,7 +200,7 @@
android:id="@+id/register_contract_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="《私语用户协议》"
android:text="《芊颜用户协议》"
android:textColor="@color/mainColor"
android:textSize="12dp"
android:textStyle="bold" />
@@ -217,7 +217,7 @@
android:id="@+id/about_contract_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="《私语隐私政策》"
android:text="《芊颜隐私政策》"
android:textColor="@color/mainColors"
android:textSize="12dp"
android:textStyle="bold" />

306
app/src/main/res/layout/activity_settings_info_edit.xml
View File

@@ -4,14 +4,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="#F6F7FB">
<com.fengliyan.uikit.scroll.ObservedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/settings_info_edit_button_confirm"
android:layout_marginBottom="10dp"
android:background="@color/white"
android:background="#F6F7FB"
tools:viewBindingIgnore="true">
<LinearLayout
@@ -19,36 +19,49 @@
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:text="我的头像"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold" />
<RelativeLayout
android:id="@+id/avatarBtn"
android:layout_width="match_parent"
android:layout_height="79dp">
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp16"
android:layout_marginTop="@dimen/dp10"
android:background="@drawable/shape_white_bg_r14">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:text="头像"
android:textColor="#ff333333"
android:textSize="16sp" />
<!-- <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:text="头像"
android:textColor="#ff333333"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="16dp"
android:text="请确保头像为本人"
android:textColor="#ffa8a8a8"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="16dp"
android:text="请确保头像为本人"
android:textColor="#ffa8a8a8"
android:textSize="14sp" />-->
<View
<!--<View
android:layout_width="match_parent"
android:layout_height="2px"
android:layout_alignParentBottom="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@color/bottomCuttingLine" />
android:background="@color/bottomCuttingLine" />-->
<ImageView
android:layout_width="wrap_content"
@@ -56,14 +69,16 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:src="@drawable/group" />
android:src="@drawable/group"
android:tint="@color/black" />
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/avatarImageView"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentRight="true"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerVertical="true"
android:layout_marginVertical="@dimen/dp15"
android:layout_marginLeft="@dimen/dp15"
android:layout_marginRight="44dp"
app:roundedCornerRadius="4dp" />
</RelativeLayout>
@@ -71,7 +86,10 @@
<RelativeLayout
android:id="@+id/videoBtn"
android:layout_width="match_parent"
android:layout_height="79dp">
android:layout_height="79dp"
android:layout_marginHorizontal="@dimen/dp16"
android:layout_marginTop="@dimen/dp15"
android:background="@drawable/shape_white_bg_r14">
<TextView
android:layout_width="wrap_content"
@@ -105,6 +123,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:tint="@color/black"
android:src="@drawable/group" />
<TextView
@@ -143,40 +162,43 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginLeft="@dimen/dp16"
android:layout_marginTop="16dp"
android:text="相册"
android:text="我的相册"
android:textColor="#ff333333"
android:textSize="16sp" />
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/zhushi_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/settings_info_edit_photos"
android:layout_marginTop="4dp"
android:background="@android:color/white"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="长按拖拽更改顺序，上传图片需审核通过后才能更新展示"
android:textColor="@color/editNotifiction"
android:textSize="14sp" />
android:orientation="vertical"
android:layout_marginTop="@dimen/dp10"
android:layout_marginHorizontal="@dimen/dp16"
android:background="@drawable/shape_white_bg_r14">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/settings_info_edit_photos"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="12dp"
android:layout_marginRight="16dp" />
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:layout_marginLeft="16dp"
android:layout_marginTop="12dp"
android:layout_marginRight="16dp"
android:background="@color/bottomCuttingLine" />
<TextView
android:id="@+id/zhushi_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/settings_info_edit_photos"
android:layout_marginTop="4dp"
android:layout_marginHorizontal="@dimen/dp16"
android:background="@android:color/white"
android:text="长按拖拽更改顺序，上传图片需审核通过后才能更新展示"
android:textColor="@color/editNotifiction"
android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/settings_info_edit_photos"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="@dimen/dp12"
android:layout_marginRight="16dp" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
@@ -184,15 +206,17 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="16dp"
android:text="基本资料"
android:textColor="#ff333333"
android:textColor="@color/black"
android:textStyle="bold"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/ll_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:background="@android:color/white"
android:layout_marginTop="10dp"
android:layout_marginHorizontal="@dimen/dp16"
android:background="@drawable/shape_white_bg_r14"
android:orientation="vertical">
<RelativeLayout
@@ -206,28 +230,31 @@
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:text="昵称"
android:textColor="#A8A8A8"
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
android:id="@+id/settings_info_edit_nick_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/iv_nike_right"
android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:textColor="#666666"
android:layout_marginRight="@dimen/dp15"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_nike_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:drawableRight="@drawable/group"
android:drawablePadding="10dp"
android:textColor="#333333"
android:textSize="16sp" />
android:tint="@color/black"
android:src="@drawable/group" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@color/bottomCuttingLine" />
<RelativeLayout
android:id="@+id/settings_info_edit_birthday_layout"
@@ -240,28 +267,30 @@
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:text="生日"
android:textColor="#A8A8A8"
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
android:id="@+id/settings_info_edit_birthday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/iv_birthday_right"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:textColor="#666666"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_birthday_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:drawableRight="@drawable/group"
android:drawablePadding="10dp"
android:textColor="#333333"
android:textSize="16sp" />
android:tint="@color/black"
android:src="@drawable/group" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@color/bottomCuttingLine" />
<RelativeLayout
android:id="@+id/settings_info_edit_job_layout"
@@ -274,28 +303,30 @@
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:text="职业"
android:textColor="#A8A8A8"
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
android:id="@+id/settings_info_edit_job"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/iv_job_right"
android:textColor="#666666"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_job_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:drawableRight="@drawable/group"
android:drawablePadding="10dp"
android:textColor="#333333"
android:textSize="16sp" />
android:tint="@color/black"
android:src="@drawable/group" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@color/bottomCuttingLine" />
<RelativeLayout
android:id="@+id/settings_info_edit_city_layout"
@@ -308,29 +339,30 @@
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:text="城市"
android:textColor="#A8A8A8"
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
android:id="@+id/settings_info_edit_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/iv_city_right"
android:textColor="#666666"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_city_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:drawableRight="@drawable/group"
android:drawablePadding="10dp"
android:textColor="#333333"
android:textSize="16sp" />
android:tint="@color/black"
android:src="@drawable/group" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@color/bottomCuttingLine" />
<RelativeLayout
android:id="@+id/settings_info_edit_ip_city_layout"
android:layout_width="match_parent"
@@ -342,7 +374,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:text="IP属地"
android:textColor="#A8A8A8"
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
@@ -353,23 +385,18 @@
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:drawablePadding="10dp"
android:textColor="#333333"
android:textColor="#666666"
android:textSize="16sp" />
</RelativeLayout>
<View
android:id="@+id/ip_city_line"
android:layout_width="match_parent"
android:layout_height="2px"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="@color/bottomCuttingLine" />
</LinearLayout>
<RelativeLayout
<LinearLayout
android:id="@+id/settings_info_edit_sign_layout"
android:layout_width="match_parent"
android:layout_height="54dp">
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp15"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
@@ -377,21 +404,52 @@
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:text="个性签名"
android:textColor="#A8A8A8"
android:textColor="@color/black"
android:textStyle="bold"
android:textSize="16sp" />
<TextView
android:id="@+id/settings_info_edit_sign"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:drawableRight="@drawable/group"
android:drawablePadding="10dp"
android:textColor="#333333"
android:textSize="16sp" />
</RelativeLayout>
android:background="@drawable/shape_white_bg_r14"
android:layout_marginTop="@dimen/dp12"
android:layout_marginHorizontal="@dimen/dp16"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp16"
android:layout_marginVertical="@dimen/dp12"
android:background="@drawable/shape_f9fafc_bg_r14">
<TextView
android:id="@+id/settings_info_edit_sign"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="555555555555555555555555555"
android:layout_toLeftOf="@+id/iv_edit_sign_right"
android:layout_marginRight="@dimen/dp10"
android:padding="@dimen/dp12"
android:textColor="#666666"
android:textSize="16sp" />
<ImageView
android:id="@+id/iv_edit_sign_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:tint="@color/black"
android:src="@drawable/group" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
<View
android:layout_width="match_parent"

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

@@ -8,7 +8,7 @@
android:background="@drawable/ic_speed_women_bg"
tools:context=".view.luck.SpeedDatingActivity">
<com.fengliyan.tianlesue.utils.WaveView
<com.xuebiping.bolizhuzi.utils.WaveView
android:id="@+id/waveView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -137,14 +137,14 @@
android:padding="16dp"
android:src="@drawable/ic_return_white" />
<com.fengliyan.tianlesue.utils.AutoPollRecyclerView
<com.xuebiping.bolizhuzi.utils.AutoPollRecyclerView
android:id="@+id/rv_banner2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="30dp" />
<com.fengliyan.tianlesue.utils.AutoPollRecyclerView
<com.xuebiping.bolizhuzi.utils.AutoPollRecyclerView
android:id="@+id/rv_banner1"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -237,7 +237,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:text="关于私语"
android:text="关于芊颜"
android:textColor="@color/loginText"
android:textSize="14sp" />

100
app/src/main/res/layout/activity_topic_dynamic_list.xml Normal file
View File

@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".view.dynamics.activity.TopicDynamicListActivity">
<RelativeLayout
android:id="@+id/rl_top_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp210">
<ImageView
android:id="@+id/iv_avatar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY"
android:src="@color/gray7"/>
<TextView
android:id="@+id/tv_see_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="已有129837次预览"
android:textSize="@dimen/dp12"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/dp40"
android:layout_marginLeft="@dimen/dp25"
android:textColor="#80FFFFFF"/>
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="今日份美貌（普信版）正常营业"
android:textSize="@dimen/dp12"
android:layout_above="@+id/tv_see_count"
android:layout_marginBottom="@dimen/dp10"
android:layout_marginLeft="@dimen/dp25"
android:textColor="#FFFFFF"/>
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="# 只想发个自拍"
android:textSize="@dimen/dp18"
android:textStyle="bold"
android:layout_above="@+id/tv_content"
android:layout_marginBottom="@dimen/dp10"
android:layout_marginLeft="@dimen/dp25"
android:textColor="#FFFFFF"/>
</RelativeLayout>
<!--<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/dynamics_refresh"
android:layout_width="match_parent"
tools:viewBindingIgnore="true"
android:background="@drawable/shape_white_dialog_bottom"
android:layout_below="@+id/rl_top_layout"
android:layout_marginTop="-20dp"
android:layout_height="match_parent">
<com.fengliyan.uikit.refresh.LoadMoreListView
android:id="@+id/dynamics_topic_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null"
android:dividerHeight="0dp" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/shape_white_dialog_bottom"
android:layout_marginTop="-20dp"
android:layout_below="@+id/rl_top_layout"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_title_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp20"
android:orientation="vertical"/>
<androidx.viewpager.widget.ViewPager
android:id="@+id/dynamic_view_pager"
android:layout_marginTop="@dimen/dp20"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
</RelativeLayout>

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

@@ -29,7 +29,7 @@
android:textColor="@color/two_text"
android:textSize="14dp" />
<com.fengliyan.tianlesue.utils.PhoneCodeView
<com.xuebiping.bolizhuzi.utils.PhoneCodeView
android:id="@+id/pc_vcode"
android:layout_width="match_parent"
android:layout_height="wrap_content"

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

@@ -7,7 +7,7 @@
android:background="@color/black"
android:orientation="vertical">
<com.fengliyan.tianlesue.view.main.ui.VerticalViewPager
<com.xuebiping.bolizhuzi.view.main.ui.VerticalViewPager
android:id="@+id/verticalviewpager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
@@ -97,7 +97,7 @@
android:layout_marginBottom="30dp"
android:background="@drawable/shape_home_progress" />
<com.fengliyan.tianlesue.utils.ProgressView
<com.xuebiping.bolizhuzi.utils.ProgressView
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="8dp"

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

@@ -50,7 +50,7 @@
</LinearLayout>
<com.fengliyan.tianlesue.view.settings.greeting.GreetingVoiceRecorderView
<com.xuebiping.bolizhuzi.view.settings.greeting.GreetingVoiceRecorderView
android:id="@+id/recordView"
android:layout_width="match_parent"
android:layout_height="180dp"

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

@@ -23,7 +23,7 @@
android:layout_marginLeft="@dimen/dp32"
android:layout_marginTop="@dimen/dp8"
android:layout_marginRight="@dimen/dp32"
android:text="为保护未成年健康成长，私语特别推出未成年模式，该模式下可以禁止所有功能，如需使用，请设置保护密码！"
android:text="为保护未成年健康成长，芊颜特别推出未成年模式，该模式下可以禁止所有功能，如需使用，请设置保护密码！"
android:textColor="@color/two_text"
android:textSize="13sp" />

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

@@ -82,7 +82,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.fengliyan.tianlesue.view.base.utils.view.LotteryView
<com.xuebiping.bolizhuzi.view.base.utils.view.LotteryView
android:id="@+id/wheel_view"
android:layout_width="0dp"
android:layout_height="0dp"

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

@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp48"
android:text="私语官方微信公众号"
android:text="芊颜官方微信公众号"
android:textColor="@color/white"
android:textSize="22sp"
android:textStyle="bold" />
@@ -52,7 +52,7 @@
android:layout_below="@+id/wechat_background"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp14"
android:text="私语官方微信公众号："
android:text="芊颜官方微信公众号："
android:textColor="@color/two_text"
android:textSize="14sp" />

17
app/src/main/res/layout/fragment_dynamic_topic.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dynamics_refresh"
android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true"
android:background="@color/white"
android:layout_height="match_parent">
<com.fengliyan.uikit.refresh.LoadMoreListView
android:id="@+id/dynamics_topic_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null"
android:dividerHeight="0dp" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

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

@@ -5,7 +5,7 @@
tools:viewBindingIgnore="true"
android:layout_height="match_parent">
<com.fengliyan.tianlesue.view.diooto.DragDiootoView
<com.xuebiping.bolizhuzi.view.diooto.DragDiootoView
android:id="@+id/dragDiootoView"
android:layout_width="match_parent"
android:layout_height="match_parent" />

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/luck_refresh"
android:layout_width="match_parent"
@@ -10,4 +10,4 @@
android:id="@+id/luck_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout>
</com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout>

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

@@ -1,4 +1,4 @@
<com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/channel_refresh"
@@ -60,4 +60,4 @@
android:layout_marginBottom="55dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout>
</com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout>

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

@@ -1,4 +1,4 @@
<com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/channel_refresh"
@@ -61,4 +61,4 @@
android:layout_marginBottom="55dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout>
</com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout>

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

@@ -1,4 +1,4 @@
<com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/channel_refresh"
@@ -60,4 +60,4 @@
android:layout_marginBottom="55dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout>
</com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout>

1608
app/src/main/res/layout/fragment_personal_main_page.xml
View File

File diff suppressed because it is too large Load Diff

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

@@ -1,4 +1,4 @@
<com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/channel_refresh"
@@ -212,4 +212,4 @@
android:layout_marginBottom="55dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</com.fengliyan.tianlesue.view.main.ui.VpSwipeRefreshLayout>
</com.xuebiping.bolizhuzi.view.main.ui.VpSwipeRefreshLayout>

1355
app/src/main/res/layout/fragment_setting.xml
View File

File diff suppressed because it is too large Load Diff

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

@@ -49,7 +49,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<com.fengliyan.tianlesue.utils.ProgressView
<com.xuebiping.bolizhuzi.utils.ProgressView
android:id="@+id/progress"
android:layout_width="0dp"
android:layout_height="8dp"

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

@@ -33,7 +33,7 @@
android:layout_below="@+id/contacts_name"
android:layout_marginTop="1dp"
android:layout_marginLeft="17dp"
android:text="Hi, 欢迎来到私语世界"
android:text="Hi, 欢迎来到芊颜世界"
android:textSize="17sp"
android:textColor="@color/loginText2"/>

17
app/src/main/res/layout/item_dynamic_list1.xml
View File

@@ -34,6 +34,8 @@
android:id="@+id/dynamic_list_photo"
android:layout_width="40dp"
android:layout_height="40dp"
fresco:roundingBorderColor="#6CE4B7"
fresco:roundingBorderWidth="@dimen/dp1"
fresco:roundedCornerRadius="24dp" />
<ImageView
@@ -262,12 +264,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/dynamic_list_image_list_3"
android:layout_marginStart="16dp"
android:layout_marginTop="15dp"
android:layout_marginRight="@dimen/dp16"
android:gravity="center_vertical"
android:layout_marginHorizontal="@dimen/dp16"
android:orientation="vertical">
<TextView
android:id="@+id/tv_topic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/dp12"
android:text="# 只想发个自拍"
android:paddingVertical="@dimen/dp2"
android:paddingHorizontal="@dimen/dp10"
android:visibility="gone"
android:background="@drawable/shape_button_e472ed_t10"
android:textColor="#E472ED"/>
<TextView
android:id="@+id/tv_see_count"
android:layout_width="wrap_content"

31
app/src/main/res/layout/item_dynamic_title.xml
View File

@@ -21,7 +21,7 @@
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/dynamic_title_name_1"
android:src="@drawable/shape_button_enable" />
android:src="@drawable/shape_button_e472ed" />
<TextView
android:id="@+id/dynamic_title_name_1"
@@ -45,7 +45,7 @@
android:layout_height="@dimen/dp5"
android:layout_below="@+id/dynamic_title_name_2"
android:layout_centerHorizontal="true"
android:src="@drawable/shape_button_enable" />
android:src="@drawable/shape_button_e472ed" />
<TextView
android:id="@+id/dynamic_title_name_2"
@@ -84,7 +84,7 @@
android:layout_height="@dimen/dp5"
android:layout_below="@+id/dynamic_title_name_3"
android:layout_centerHorizontal="true"
android:src="@drawable/shape_button_enable" />
android:src="@drawable/shape_button_e472ed" />
<TextView
android:id="@+id/dynamic_title_name_3"
@@ -116,6 +116,31 @@
</LinearLayout>
<RelativeLayout
android:id="@+id/dynamic_title_view_4"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp20"
android:layout_toEndOf="@+id/dynamic_title_view_3">
<ImageView
android:id="@+id/dynamic_title_bottom_line_4"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_below="@+id/dynamic_title_name_4"
android:layout_centerHorizontal="true"
android:src="@drawable/shape_button_e472ed" />
<TextView
android:id="@+id/dynamic_title_name_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="话题"
android:textColor="@color/grey_text"
android:textSize="16dp" />
</RelativeLayout>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/dynamic_title_my"
android:layout_width="24dp"

371
app/src/main/res/layout/item_dynamic_topic.xml Normal file
View File

@@ -0,0 +1,371 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fresco="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/dp80"
android:background="@color/white"
android:orientation="vertical"
tools:viewBindingIgnore="true">
<com.youth.banner.Banner
android:id="@+id/image_banner"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@drawable/shape_banner_bg"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/rl_dynamic_item"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white">
<RelativeLayout
android:id="@+id/rl_dynamic_photo"
android:layout_width="@dimen/dp53"
android:layout_height="@dimen/dp53"
android:layout_centerVertical="true"
android:layout_marginStart="16dp">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/dynamic_list_photo"
android:layout_width="@dimen/dp53"
android:layout_height="@dimen/dp53"
fresco:roundedCornerRadius="24dp" />
<ImageView
android:id="@+id/iv_sex"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:background="@drawable/shape_dynamic_age"
android:padding="2dp"
android:visibility="gone"
android:src="@mipmap/sex_men" />
</RelativeLayout>
<TextView
android:id="@+id/dynamic_list_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="@dimen/dp20"
android:layout_toRightOf="@+id/rl_dynamic_photo"
android:text="醉红颜"
android:textColor="#2D2D2D"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/dynamic_list_age"
android:layout_width="wrap_content"
android:layout_height="14dp"
android:layout_marginLeft="5dp"
android:layout_marginTop="20dp"
android:layout_toRightOf="@+id/dynamic_list_name"
android:background="@drawable/shape_dynamic_age"
android:drawableLeft="@mipmap/sex_men"
android:gravity="center"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:text=" 22"
android:textColor="@android:color/white"
android:textSize="10sp"
android:visibility="gone" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/dynamic_list_age"
android:visibility="gone"
android:orientation="horizontal">
<ImageView
android:id="@+id/realPeopleImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginTop="20dp"
android:src="@mipmap/feed_realpeople" />
<ImageView
android:id="@+id/newPeopleImageView"
android:layout_width="wrap_content"
android:layout_height="14dp"
android:layout_marginStart="4dp"
android:layout_marginTop="20dp"
android:layout_toRightOf="@id/realPeopleImageView"
android:src="@mipmap/feed_newpeople" />
</LinearLayout>
<TextView
android:id="@+id/dynamic_list_sub_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/dynamic_list_name"
android:layout_marginLeft="12dp"
android:layout_marginTop="5dp"
android:layout_toRightOf="@+id/rl_dynamic_photo"
android:text="深圳 | 18:26"
android:textColor="#8D8D8D"
android:textSize="12sp" />
<ImageView
android:id="@+id/msgBtn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:src="@mipmap/feed_msg"
android:visibility="gone" />
<ImageView
android:id="@+id/dynamic_list_menu"
android:layout_width="@dimen/dp20"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginEnd="8dp"
android:scaleType="center"
android:layout_centerVertical="true"
android:src="@mipmap/girlauth_right"
android:visibility="visible" />
<com.zld.expandlayout.ExpandLayout
android:id="@+id/dynamic_list_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/rl_dynamic_photo"
android:layout_alignStart="@+id/dynamic_list_name"
android:layout_marginTop="10dp"
android:layout_marginRight="16dp"
android:visibility="gone"
android:text="abc"
fresco:collapseText="收起"
fresco:contentTextColor="#2D2D2D"
fresco:contentTextSize="14sp"
fresco:ellipsizeText="..."
fresco:expandCollapseTextColor="@color/invite_text_color"
fresco:expandCollapseTextGravity="left"
fresco:expandCollapseTextSize="14sp"
fresco:expandText="全文"
fresco:maxCollapsedLines="6" />
<LinearLayout
android:id="@+id/dynamic_list_image_list_1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/dynamic_list_message"
android:layout_alignStart="@+id/dynamic_list_name"
android:layout_marginTop="9dp"
android:layout_marginRight="16dp"
android:orientation="horizontal"
android:visibility="gone"
android:weightSum="3" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/dynamic_list_image_list_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/dynamic_list_image_list_1"
android:layout_alignStart="@+id/dynamic_list_name"
android:layout_marginTop="6dp"
android:layout_marginEnd="16dp"
android:minHeight="170dp"
android:visibility="gone">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/dynamic_image1"
android:layout_width="0dp"
android:layout_height="0dp"
fresco:layout_constraintBottom_toBottomOf="parent"
fresco:layout_constraintEnd_toStartOf="@+id/dynamic_image2"
fresco:layout_constraintHorizontal_weight="0.7"
fresco:layout_constraintStart_toStartOf="parent"
fresco:layout_constraintTop_toTopOf="parent"
fresco:roundBottomLeft="true"
fresco:roundBottomRight="false"
fresco:roundTopLeft="true"
fresco:roundTopRight="false"
fresco:roundedCornerRadius="16dp" />
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/dynamic_image2"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="2dp"
fresco:layout_constraintBottom_toTopOf="@+id/dynamic_image3"
fresco:layout_constraintEnd_toEndOf="parent"
fresco:layout_constraintHorizontal_weight="0.3"
fresco:layout_constraintStart_toEndOf="@+id/dynamic_image1"
fresco:layout_constraintTop_toTopOf="parent"
fresco:roundBottomLeft="false"
fresco:roundBottomRight="false"
fresco:roundTopLeft="false"
fresco:roundTopRight="true"
fresco:roundedCornerRadius="16dp" />
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/dynamic_image3"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="2dp"
android:layout_marginTop="2dp"
fresco:layout_constraintBottom_toBottomOf="parent"
fresco:layout_constraintEnd_toEndOf="parent"
fresco:layout_constraintHorizontal_weight="0.3"
fresco:layout_constraintStart_toEndOf="@+id/dynamic_image1"
fresco:layout_constraintTop_toBottomOf="@+id/dynamic_image2"
fresco:roundBottomLeft="false"
fresco:roundBottomRight="true"
fresco:roundTopLeft="false"
fresco:roundTopRight="false"
fresco:roundedCornerRadius="16dp" />
<com.flyco.roundview.RoundTextView
android:id="@+id/dynamic_image_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="5dp"
android:drawableStart="@mipmap/icon_dynamic_image"
android:drawablePadding="2dp"
android:paddingStart="2dp"
android:paddingTop="2dp"
android:paddingEnd="6dp"
android:paddingBottom="2dp"
android:text="4"
android:textColor="@color/white"
android:textSize="10dp"
android:visibility="gone"
fresco:layout_constraintBottom_toBottomOf="parent"
fresco:layout_constraintEnd_toEndOf="parent"
fresco:rv_backgroundColor="#CC333333"
fresco:rv_cornerRadius="4dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/dynamic_list_image_list_3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/dynamic_list_image_list_2"
android:layout_alignStart="@+id/dynamic_list_name"
android:layout_marginTop="6dp"
android:layout_marginRight="16dp"
android:orientation="horizontal"
android:visibility="gone"
android:weightSum="3" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/dynamic_list_image_list_3"
android:layout_marginStart="16dp"
android:layout_marginTop="15dp"
android:visibility="gone"
android:layout_marginRight="@dimen/dp16"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/tv_see_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textSize="@dimen/dp12"
android:text="已有0次浏览"
android:textColor="#E472ED"/>
<LinearLayout
android:id="@+id/item_dynamic_gift_layout"
android:layout_width="@dimen/dp60"
android:layout_height="@dimen/dp26"
android:layout_gravity="center"
android:layout_below="@+id/tv_see_count"
android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp15"
android:gravity="center"
android:background="@drawable/shape_button_enable"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_dynamic_gift_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="打赏"
android:layout_marginLeft="@dimen/dp5"
android:textColor="@color/white"
android:textSize="@dimen/dp12"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>
<!--<LinearLayout
android:id="@+id/item_dynamic_gift_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/dynamic_list_image_list_3"
android:layout_marginStart="16dp"
android:layout_marginTop="15dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<View
android:layout_width="0dp"
android:layout_height="10dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/likeImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/feed_heart" />
<TextView
android:id="@+id/likeCountLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:text="0"
android:textColor="@color/grey_text"
android:textSize="10sp" />
<ImageView
android:id="@+id/commentImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@mipmap/feed_circle" />
<TextView
android:id="@+id/commentCountLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:layout_marginEnd="28dp"
android:text="0"
android:textColor="@color/grey_text"
android:textSize="10sp" />
</LinearLayout>-->
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_marginTop="13dp"
android:background="@color/mainBg"
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>

60
app/src/main/res/layout/item_dynamic_topic_title.xml Normal file
View File

@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal"
tools:viewBindingIgnore="true">
<RelativeLayout
android:id="@+id/dynamic_title_view_1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="16dp"
android:layout_marginEnd="20dp">
<ImageView
android:id="@+id/dynamic_title_bottom_line_1"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/dynamic_title_name_1"
android:src="@drawable/shape_button_e472ed" />
<TextView
android:id="@+id/dynamic_title_name_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="最新"
android:textColor="@color/one_text"
android:textSize="20dp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/dynamic_title_view_2"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_toEndOf="@+id/dynamic_title_view_1">
<ImageView
android:id="@+id/dynamic_title_bottom_line_2"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_below="@+id/dynamic_title_name_2"
android:layout_centerHorizontal="true"
android:src="@drawable/shape_button_e472ed" />
<TextView
android:id="@+id/dynamic_title_name_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="最热"
android:textColor="@color/grey_text"
android:textSize="16dp" />
</RelativeLayout>
</RelativeLayout>

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

@@ -6,7 +6,7 @@
tools:viewBindingIgnore="true"
android:padding="4dp">
<com.fengliyan.tianlesue.utils.RoundAngleImageView
<com.xuebiping.bolizhuzi.utils.RoundAngleImageView
android:id="@+id/item_free_video_image"
android:layout_width="125dp"
android:layout_height="125dp" />

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

@@ -37,7 +37,7 @@
android:layout_marginTop="1dp"
android:layout_toRightOf="@+id/news_photo"
android:layout_marginLeft="15.5dp"
android:text="Hi，欢迎来到私语世界"
android:text="Hi，欢迎来到芊颜世界"
android:textColor="@color/loginText2"
android:maxLines="1"
android:ellipsize="end"

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

@@ -33,7 +33,7 @@
android:layout_below="@+id/notice_1_child_name"
android:layout_marginTop="1dp"
android:layout_marginLeft="17dp"
android:text="Hi, 欢迎来到私语世界"
android:text="Hi, 欢迎来到芊颜世界"
android:textSize="17sp"
android:textColor="@color/loginText2"/>

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

@@ -78,7 +78,7 @@
android:background="@drawable/shape_home_progress"
android:visibility="gone" />
<com.fengliyan.tianlesue.utils.ProgressView
<com.xuebiping.bolizhuzi.utils.ProgressView
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="8dp"

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

@@ -14,7 +14,7 @@
<!--android:layout_height="@dimen/dp56"-->
<!--android:layout_marginTop="@dimen/dp10"-->
<!--fresco:roundAsCircle="true" />-->
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/item_sv_avatar"
android:layout_width="@dimen/dp56"
android:layout_height="@dimen/dp56"

16
app/src/main/res/layout/item_social_list.xml
View File

@@ -24,8 +24,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/social_list_photo"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
fresco:roundAsCircle="true" />
@@ -111,6 +111,18 @@
android:textSize="14sp"
android:visibility="gone" />
<Button
android:id="@+id/social_chat"
android:layout_width="72dp"
android:layout_height="32dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:text="发消息"
android:textColor="@android:color/white"
android:textSize="14sp"
android:visibility="gone" />
<TextView
android:visibility="gone"
android:id="@+id/social_time"

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

@@ -28,6 +28,6 @@
android:paddingLeft="@dimen/dp12"
android:textColor="@color/one_text"
android:textSize="16sp"
tool:text="欢迎私语" />
tool:text="欢迎芊颜" />
</LinearLayout>
</LinearLayout>

51
app/src/main/res/layout/item_topic_list_dialog.xml Normal file
View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fresco="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginVertical="@dimen/dp8"
tools:viewBindingIgnore="true">
<RelativeLayout
android:id="@+id/rl_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp25"
android:orientation="vertical"
>
<ImageView
android:id="@+id/iv_img"
android:layout_width="@dimen/dp13"
android:layout_height="@dimen/dp13"
android:layout_centerVertical="true"
android:src="@mipmap/ic_topic_list_d"/>
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp15"
android:layout_toRightOf="@+id/iv_img"
android:textSize="@dimen/sp12"
android:text="今日造型"
android:gravity="center"
/>
<TextView
android:id="@+id/tv_see_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/color_grey_999999"
android:layout_alignParentRight="true"
android:textSize="@dimen/sp12"
android:text="208734浏览量"
android:gravity="center"
/>
</RelativeLayout>
</LinearLayout>

33
app/src/main/res/layout/item_topic_zjuse.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fresco="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginHorizontal="@dimen/dp5"
android:layout_marginVertical="@dimen/dp5"
tools:viewBindingIgnore="true">
<LinearLayout
android:id="@+id/ll_layout"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp25"
android:orientation="vertical"
android:layout_gravity="center"
android:gravity="center"
android:background="@drawable/bg_999999_t10">
<TextView
android:id="@+id/tv_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="@dimen/sp12"
android:text="# 今日造型"
android:gravity="center"
android:textStyle="bold"
android:paddingHorizontal="@dimen/dp12"/>
</LinearLayout>
</LinearLayout>

76
app/src/main/res/layout/layout_topic_list_dialog.xml Normal file
View File

@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_white_dialog_bottom"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/iv_close"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp20"
android:layout_marginTop="@dimen/dp22"
android:layout_marginLeft="@dimen/dp25"
android:src="@mipmap/ic_black_back" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="选择话题"
android:textColor="@color/black"
android:textSize="@dimen/dp15"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp25"
android:textStyle="bold"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_title"
android:layout_marginTop="@dimen/dp15"
android:layout_marginHorizontal="@dimen/dp20"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="最近使用"
android:textSize="@dimen/dp14"
android:textStyle="bold"
android:textColor="@color/black"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_zj_use_list"
android:layout_marginTop="@dimen/dp10"
android:layout_marginBottom="@dimen/dp15"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp1"
android:background="#EEEEEE"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="最近使用"
android:textSize="@dimen/dp14"
android:layout_marginTop="@dimen/dp20"
android:textStyle="bold"
android:textColor="@color/black"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_topic_list"
android:layout_marginTop="@dimen/dp10"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>

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

@@ -14,7 +14,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<com.fengliyan.tianlesue.im.uikit.business.team.ui.TeamInfoGridView
<com.xuebiping.bolizhuzi.im.uikit.business.team.ui.TeamInfoGridView
android:id="@+id/team_member_grid_view"
style="@style/grid_view"
android:layout_width="fill_parent"

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

@@ -47,7 +47,7 @@
android:layout_marginRight="15dip"
android:layout_marginTop="20dip">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/team_head_image"
android:layout_width="50dip"
android:layout_height="50dip" />
@@ -122,7 +122,7 @@
android:id="@+id/team_memeber_layout"
layout="@layout/nim_advanced_team_info_divider_item" />
<com.fengliyan.tianlesue.im.uikit.business.team.ui.TeamInfoGridView
<com.xuebiping.bolizhuzi.im.uikit.business.team.ui.TeamInfoGridView
android:id="@+id/team_member_grid_view"
style="@style/grid_view"
android:layout_width="fill_parent"

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

@@ -34,7 +34,7 @@
android:layout_marginTop="30dp"
android:orientation="vertical">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/team_member_head_view"
android:layout_width="69dp"
android:layout_height="69dp"

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

@@ -6,7 +6,7 @@
android:layout_height="wrap_content"
android:padding="8dp">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/imageViewHeader"
android:layout_width="@dimen/avatar_size_robot"
android:layout_height="@dimen/avatar_size_robot"/>

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

@@ -12,7 +12,7 @@
android:layout_margin="8dp"
android:layout_centerVertical="true">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/imageViewHeader"
android:layout_width="@dimen/avatar_size_default"
android:layout_height="@dimen/avatar_size_default"/>

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

@@ -16,7 +16,7 @@
<include layout="@layout/nim_message_activity_text_layout"/>
<com.fengliyan.tianlesue.im.uikit.business.session.emoji.EmoticonPickerView
<com.xuebiping.bolizhuzi.im.uikit.business.session.emoji.EmoticonPickerView
android:id="@+id/emoticon_picker_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -6,7 +6,7 @@
tools:viewBindingIgnore="true"
android:layout_height="wrap_content">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/contact_select_area_image"
android:layout_width="@dimen/avatar_size_in_contact"
android:layout_height="@dimen/avatar_size_in_contact"

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

@@ -47,7 +47,7 @@
android:textSize="40.0dip"
android:visibility="invisible"/>
<com.fengliyan.tianlesue.im.uikit.common.ui.liv.LetterIndexView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.liv.LetterIndexView
android:id="@+id/liv_index"
android:layout_width="15dip"
android:layout_height="fill_parent"

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

@@ -14,7 +14,7 @@
android:layout_alignParentLeft="true"
android:gravity="center">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/contacts_item_head"
android:layout_width="@dimen/avatar_size_in_contact"
android:layout_height="@dimen/avatar_size_in_contact"

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

@@ -70,7 +70,7 @@
android:textSize="40sp"
android:visibility="invisible" />
<com.fengliyan.tianlesue.im.uikit.common.ui.liv.LetterIndexView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.liv.LetterIndexView
android:id="@+id/liv_index"
android:layout_width="15dip"
android:layout_height="fill_parent"

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

@@ -18,7 +18,7 @@
android:layout_marginLeft="10dp"
android:contentDescription="@string/empty" />
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/img_head"
android:layout_width="@dimen/avatar_size_in_contact"
android:layout_height="@dimen/avatar_size_in_contact"

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

@@ -23,7 +23,7 @@
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.CropImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.CropImageView
android:id="@+id/cropable_image_view"
android:layout_width="match_parent"
android:layout_height="match_parent"

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

@@ -8,7 +8,7 @@
android:gravity="center"
android:orientation="vertical" >
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.MultiTouchZoomableImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.MultiTouchZoomableImageView
android:id="@+id/watch_image_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />

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

@@ -9,7 +9,7 @@
<include layout="@layout/nim_message_activity_text_layout" />
<com.fengliyan.tianlesue.im.uikit.business.session.emoji.EmoticonPickerView
<com.xuebiping.bolizhuzi.im.uikit.business.session.emoji.EmoticonPickerView
android:id="@+id/emoticon_picker_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -26,13 +26,13 @@
android:layout_height="match_parent"
android:scaleType="fitXY" />
<com.fengliyan.tianlesue.utils.MaskImageView
<com.xuebiping.bolizhuzi.utils.MaskImageView
android:id="@+id/iv_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop" />
<com.fengliyan.tianlesue.im.uikit.business.session.helper.MsgBkImageView
<com.xuebiping.bolizhuzi.im.uikit.business.session.helper.MsgBkImageView
android:id="@+id/message_activity_background"
android:layout_width="match_parent"
android:layout_height="match_parent" />

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

@@ -25,7 +25,7 @@
android:textStyle="bold"
android:visibility="gone" />
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/message_item_portrait_left"
android:layout_width="@dimen/avatar_size_in_session"
android:layout_height="@dimen/avatar_size_in_session"
@@ -53,7 +53,7 @@
android:background="@color/transparent"
android:visibility="gone" />
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/message_item_portrait_right"
android:layout_width="@dimen/avatar_size_in_session"
android:layout_height="@dimen/avatar_size_in_session"

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

@@ -4,7 +4,7 @@
tools:viewBindingIgnore="true"
android:layout_height="wrap_content">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.MsgThumbImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.MsgThumbImageView
android:id="@+id/message_item_location_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -5,7 +5,7 @@
tools:viewBindingIgnore="true"
android:layout_height="wrap_content">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.MsgThumbImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.MsgThumbImageView
android:id="@+id/message_item_thumb_thumbnail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.fengliyan.tianlesue.im.uikit.business.session.viewholder.robot.RobotContentLinearLayout
<com.xuebiping.bolizhuzi.im.uikit.business.session.viewholder.robot.RobotContentLinearLayout
android:id="@+id/robot_out"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -4,7 +4,7 @@
tools:viewBindingIgnore="true"
android:layout_height="wrap_content">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.MsgThumbImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.MsgThumbImageView
android:id="@+id/message_item_thumb_thumbnail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -6,7 +6,7 @@
tools:viewBindingIgnore="true"
android:layout_gravity="center_horizontal">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.MsgThumbImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.MsgThumbImageView
android:id="@+id/message_item_thumb_thumbnail"
android:layout_width="match_parent"
android:layout_height="match_parent"

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

@@ -12,7 +12,7 @@
android:padding="10dip"
android:visibility="gone" >
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/new_message_tip_head_image_view"
android:layout_width="25dip"
android:layout_height="25dip"

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

@@ -7,7 +7,7 @@
tools:viewBindingIgnore="true"
android:paddingRight="15dip" >
<com.fengliyan.tianlesue.im.uikit.common.ui.popupmenu.PopupMenuListView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.popupmenu.PopupMenuListView
android:id="@+id/popmenu_listview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -8,7 +8,7 @@
tools:viewBindingIgnore="true"
android:paddingTop="@dimen/split_one_pixels" >
<com.fengliyan.tianlesue.im.uikit.common.ui.popupmenu.PopupMenuListView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.popupmenu.PopupMenuListView
android:id="@+id/popmenu_listview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -9,7 +9,7 @@
android:gravity="center"
android:orientation="vertical" >
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.MultiTouchZoomableImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.MultiTouchZoomableImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -9,7 +9,7 @@
android:gravity="center"
android:orientation="vertical" >
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.MultiTouchZoomableImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.MultiTouchZoomableImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@@ -10,7 +10,7 @@
android:layout_height="fill_parent"
>
<com.fengliyan.tianlesue.im.uikit.common.ui.ptr2.LoadingView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.ptr2.LoadingView
android:id="@+id/custom_loading"
android:layout_width="fill_parent"
android:layout_height="50dp"

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

@@ -27,7 +27,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/img_head"
android:layout_width="@dimen/avatar_size_default"
android:layout_height="@dimen/avatar_size_default"
@@ -149,7 +149,7 @@
android:textColor="@color/color_grey_999999"
android:textSize="12sp" />
<com.fengliyan.tianlesue.im.uikit.common.ui.drop.DropFake
<com.xuebiping.bolizhuzi.im.uikit.common.ui.drop.DropFake
android:id="@+id/unread_number_tip"
android:layout_width="28dip"
android:layout_height="28dip"

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

@@ -35,7 +35,7 @@
android:layout_height="fill_parent"
android:orientation="vertical">
<com.fengliyan.tianlesue.im.uikit.business.team.ui.TeamInfoGridView
<com.xuebiping.bolizhuzi.im.uikit.business.team.ui.TeamInfoGridView
android:id="@+id/team_members_grid_view"
style="@style/grid_view"
android:layout_width="fill_parent"

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

@@ -38,7 +38,7 @@
android:layout_height="match_parent"
android:orientation="horizontal">
<com.fengliyan.tianlesue.im.uikit.business.team.ui.TeamInfoGridView
<com.xuebiping.bolizhuzi.im.uikit.business.team.ui.TeamInfoGridView
android:id="@+id/team_member_grid"
style="@style/grid_view"
android:layout_width="fill_parent"

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

@@ -11,7 +11,7 @@
android:layout_height="55dp"
android:layout_centerHorizontal="true">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/imageViewHeader"
android:layout_width="@dimen/avatar_size_default"
android:layout_height="@dimen/avatar_size_default"/>

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

@@ -12,7 +12,7 @@
android:layout_margin="8dp"
android:layout_centerVertical="true">
<com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView
<com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView
android:id="@+id/imageViewHeader"
android:layout_width="@dimen/avatar_size_default"
android:layout_height="@dimen/avatar_size_default"/>

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

@@ -17,7 +17,7 @@
android:textColor="@color/color_black_ff333333"
android:textSize="16sp" />
<com.fengliyan.tianlesue.im.uikit.common.ui.widget.SwitchButton
<com.xuebiping.bolizhuzi.im.uikit.common.ui.widget.SwitchButton
android:id="@+id/user_profile_toggle"
android:layout_width="58dip"
android:layout_height="36.67dip"

Some files were not shown because too many files have changed in this diff Show More