排行榜UI修改

This commit is contained in:
被淹死的鱼
2026-03-18 17:29:18 +08:00
parent 2327d4d5d9
commit 659eef7e29
84 changed files with 1164 additions and 848 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 KiB

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:type="linear"
android:angle="90"
android:endColor="#EB6EEC"
android:startColor="#EC696F"/>
</shape>

View File

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

View File

@@ -2,7 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#925BF7"
android:startColor="#E69EFF" />
android:angle="270"
android:endColor="#EE7874"
android:startColor="#F3C89B" />
<corners android:radius="10dp" />
</shape>

View File

@@ -3,6 +3,5 @@
<solid android:color="@color/white" />
<corners
android:topLeftRadius="5dp"
android:topRightRadius="5dp" />
android:radius="10dp" />
</shape>

View File

@@ -15,6 +15,7 @@
android:layout_marginHorizontal="@dimen/dp20"
android:layout_marginTop="@dimen/dp15"
android:layout_marginBottom="@dimen/dp20"
android:visibility="gone"
android:orientation="horizontal">
<TextView

View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_gray"
android:background="#F7F8FC"
android:orientation="vertical"
tools:viewBindingIgnore="true">
@@ -12,7 +12,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/ic_sign_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -90,7 +89,6 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:background="@drawable/shape_white_bg_r14"
android:orientation="vertical"
android:paddingTop="14dp"
android:paddingBottom="14dp"
@@ -102,129 +100,137 @@
android:id="@+id/tv_mission_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginBottom="8dp"
android:text="每日任务"
android:textColor="@color/black"
android:textSize="16dp"
android:textStyle="bold" />
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@android:color/white">
android:layout_height="wrap_content"
android:background="@drawable/shape_white_bg_r14"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_sign_dynamic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@drawable/ic_sign_dynamic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="60dp"
>
<TextView
android:id="@+id/tv_dy1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="发布动态"
android:textColor="@color/one_text"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_dy2"
app:layout_constraintStart_toEndOf="@+id/iv_sign_dynamic"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_sign_dynamic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@drawable/ic_sign_dynamic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_dy2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:text="随机记录我的精彩生活 +10金币"
android:textColor="@color/two_text"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_sign_dynamic"
app:layout_constraintTop_toBottomOf="@+id/tv_dy1" />
<TextView
android:id="@+id/tv_dy1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="发布动态"
android:textColor="@color/one_text"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_dy2"
app:layout_constraintStart_toEndOf="@+id/iv_sign_dynamic"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_go_dy"
android:layout_width="64dp"
android:layout_height="28dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_btn_sign_mission"
android:gravity="center"
android:text="去发布"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_dy2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:text="随机记录我的精彩生活 +10金币"
android:textColor="@color/two_text"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_sign_dynamic"
app:layout_constraintTop_toBottomOf="@+id/tv_dy1" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mission_invite"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@android:color/white">
<TextView
android:id="@+id/tv_go_dy"
android:layout_width="64dp"
android:layout_height="28dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_btn_sign_mission"
android:gravity="center"
android:text="去发布"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/iv_sign_invite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@drawable/ic_sign_invite"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_mission_invite"
android:layout_width="match_parent"
android:layout_height="60dp"
>
<TextView
android:id="@+id/tv_invite1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="邀请好友"
android:textColor="@color/one_text"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_invite2"
app:layout_constraintStart_toEndOf="@+id/iv_sign_invite"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/iv_sign_invite"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:src="@drawable/ic_sign_invite"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_invite1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="邀请好友"
android:textColor="@color/one_text"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_invite2"
app:layout_constraintStart_toEndOf="@+id/iv_sign_invite"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_invite2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:text="一起遇见心动开启邂逅"
android:textColor="@color/two_text"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_sign_invite"
app:layout_constraintTop_toBottomOf="@+id/tv_invite1" />
<TextView
android:id="@+id/tv_go_invite"
android:layout_width="64dp"
android:layout_height="28dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_btn_sign_mission"
android:gravity="center"
android:text="去邀请"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<TextView
android:id="@+id/tv_invite2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp"
android:gravity="center"
android:text="一起遇见心动开启邂逅"
android:textColor="@color/two_text"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_sign_invite"
app:layout_constraintTop_toBottomOf="@+id/tv_invite1" />
<TextView
android:id="@+id/tv_go_invite"
android:layout_width="64dp"
android:layout_height="28dp"
android:layout_marginEnd="14dp"
android:background="@drawable/bg_btn_sign_mission"
android:gravity="center"
android:text="去邀请"
android:textColor="@color/white"
android:textSize="14dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<ImageView
@@ -233,15 +239,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="54dp"
android:padding="16dp"
android:src="@drawable/ic_return_white"
android:src="@mipmap/ic_black_back"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="每日任务"
android:textColor="@color/white"
android:text="任务中心"
android:textColor="@color/black"
android:textStyle="bold"
android:textSize="18dp"
app:layout_constraintBottom_toBottomOf="@+id/iv_sign_finish"
app:layout_constraintEnd_toEndOf="parent"

View File

@@ -52,6 +52,7 @@
android:id="@+id/system_setting_vip"
android:layout_width="match_parent"
android:layout_height="@dimen/dp54"
android:visibility="gone"
android:layout_marginTop="@dimen/dp6"
android:background="@android:color/white">
@@ -257,15 +258,16 @@
android:layout_width="match_parent"
android:layout_height="54dp"
android:layout_marginTop="@dimen/dp16"
android:background="@android:color/white">
android:layout_marginHorizontal="@dimen/dp20"
android:background="@drawable/shape_button_enable">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginLeft="16dp"
android:textStyle="bold"
android:text="退出登录"
android:textColor="@color/loginText"
android:textColor="@color/white"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>

View File

@@ -1,120 +1,255 @@
<?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"
android:orientation="vertical"
xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/mainBg">
android:background="@color/mainBg"
android:orientation="vertical"
tools:viewBindingIgnore="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.fengliyan.uikit.specialui.ArcView
<!--<com.fengliyan.uikit.specialui.ArcView
android:id="@+id/wallet_arcview"
android:layout_width="match_parent"
android:layout_height="105dp"
fresco:arcHeight="20dp"/>
fresco:arcHeight="20dp"/>-->
<RelativeLayout
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@mipmap/ic_wallet_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:background="@drawable/shape_wallet_header">
<TextView
android:id="@+id/wallet_charge_title"
android:layout_marginTop="@dimen/dp50"
android:layout_marginRight="16dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="充值的金币"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"
android:layout_marginLeft="18dp"
android:layout_marginTop="25dp"/>
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/wallet_charge_amount"
<TextView
android:id="@+id/wallet_charge_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="32sp" />
<TextView
android:id="@+id/wallet_charge_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp6"
android:text="充值的金币"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#680ad2"
android:textSize="32sp"
android:layout_marginLeft="18dp"
android:layout_marginTop="12dp"
android:layout_below="@+id/wallet_charge_title"/>
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/wallet_income_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="收益的金币"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"
android:layout_marginLeft="18dp"
android:layout_marginTop="38dp"
android:layout_below="@+id/wallet_charge_amount"/>
<TextView
android:id="@+id/wallet_income_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="32sp" />
<TextView
android:id="@+id/wallet_income_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="#680ad2"
android:textSize="32sp"
android:layout_marginLeft="18dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="32dp"
android:layout_below="@+id/wallet_income_title"/>
<Button
android:id="@+id/wallet_recharge_button"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_marginRight="12dp"
android:layout_marginTop="65dp"
android:text="充值"
android:textSize="14sp"
android:textColor="@color/white"/>
<TextView
android:id="@+id/wallet_income_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp6"
android:text="收益的金币"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<Button
android:id="@+id/wallet_exchange_button"
android:layout_width="70dp"
android:layout_height="30dp"
android:background="@drawable/shape_wallet_button"
android:layout_toLeftOf="@+id/wallet_cash_button"
android:layout_marginRight="12dp"
android:layout_marginTop="175dp"
android:visibility="gone"
android:text="兑换"
android:textSize="14sp"
android:textColor="@color/mainColor"/>
<Button
android:id="@+id/wallet_cash_button"
android:layout_width="70dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_marginRight="12dp"
android:layout_marginTop="175dp"
android:visibility="visible"
android:background="@drawable/shape_wallet_button"
android:text="提现"
android:textSize="14sp"
android:textColor="@color/mainColor"/>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="@dimen/dp10"
android:layout_marginTop="-60dp"
android:background="@drawable/shape_white_dialog_bottom"
android:orientation="vertical">
<LinearLayout
android:id="@+id/wallet_recharge_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/dp20">
<ImageView
android:layout_width="@dimen/dp21"
android:layout_height="@dimen/dp21"
android:src="@mipmap/ic_wallet_recharge" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12"
android:layout_weight="1"
android:text="充值"
android:textColor="@color/black"
android:textSize="@dimen/dp14"
android:textStyle="bold" />
<ImageView
android:layout_width="@dimen/dp16"
android:layout_height="@dimen/dp16"
android:src="@mipmap/girlauth_right"
android:tint="@color/black" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginHorizontal="@dimen/dp20"
android:background="#EEEEEE" />
<LinearLayout
android:id="@+id/wallet_bill_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/dp20">
<ImageView
android:layout_width="@dimen/dp21"
android:layout_height="@dimen/dp21"
android:src="@mipmap/ic_wallet_bill" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12"
android:layout_weight="1"
android:text="账单明细"
android:textColor="@color/black"
android:textSize="@dimen/dp14"
android:textStyle="bold" />
<ImageView
android:layout_width="@dimen/dp16"
android:layout_height="@dimen/dp16"
android:src="@mipmap/girlauth_right"
android:tint="@color/black" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginHorizontal="@dimen/dp20"
android:background="#EEEEEE" />
<LinearLayout
android:id="@+id/wallet_cash_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/dp20">
<ImageView
android:layout_width="@dimen/dp21"
android:layout_height="@dimen/dp21"
android:src="@mipmap/ic_wallet_cash" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12"
android:layout_weight="1"
android:text="提现"
android:textColor="@color/black"
android:textSize="@dimen/dp14"
android:textStyle="bold" />
<ImageView
android:layout_width="@dimen/dp16"
android:layout_height="@dimen/dp16"
android:src="@mipmap/girlauth_right"
android:tint="@color/black" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginHorizontal="@dimen/dp20"
android:background="#EEEEEE" />
<LinearLayout
android:id="@+id/wallet_exchange_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/dp20">
<ImageView
android:layout_width="@dimen/dp21"
android:layout_height="@dimen/dp21"
android:src="@mipmap/ic_wallet_exchange" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp12"
android:layout_weight="1"
android:text="兑换"
android:textColor="@color/black"
android:textSize="@dimen/dp14"
android:textStyle="bold" />
<ImageView
android:layout_width="@dimen/dp16"
android:layout_height="@dimen/dp16"
android:src="@mipmap/girlauth_right"
android:tint="@color/black" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginHorizontal="@dimen/dp20"
android:background="#EEEEEE" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_wallet_header"
android:orientation="vertical"
android:layout_marginLeft="16dp"
android:layout_marginTop="22dp"
android:layout_marginRight="16dp"
android:layout_marginLeft="16dp"
android:background="@drawable/shape_wallet_header"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="85dp"
@@ -124,16 +259,17 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_weight="1">
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="充值的金币"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"/>
android:textSize="14sp" />
<TextView
android:id="@+id/wallet_caibei_recharge"
@@ -148,16 +284,18 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_weight="1">
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="收益的金币"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"/>
android:textSize="14sp" />
<TextView
android:id="@+id/wallet_caibei_income"
android:layout_width="wrap_content"
@@ -173,41 +311,42 @@
<View
android:layout_width="match_parent"
android:layout_height="2px"
android:background="@color/bottomCuttingLine"/>
android:background="@color/bottomCuttingLine" />
<RelativeLayout
android:id="@+id/wallet_caibei_recharge_layout"
android:layout_width="match_parent"
android:layout_height="60dp">
<ImageView
android:id="@+id/wallet_shell"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:src="@drawable/ic_shell"/>
android:src="@drawable/ic_shell" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/wallet_shell"
android:layout_centerVertical="true"
android:layout_marginLeft="6dp"
android:layout_toRightOf="@+id/wallet_shell"
android:text="金币"
android:textSize="18sp"
android:layout_centerVertical="true"
android:textColor="@color/infoEditTextColor2"/>
android:textColor="@color/infoEditTextColor2"
android:textSize="18sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@drawable/group"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="16sp"
android:drawableRight="@drawable/group"
android:drawablePadding="5dp"
android:text="充值"
android:textColor="@color/infoEditTextColor2"
android:textSize="14sp"/>
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>

View File

@@ -23,6 +23,14 @@
android:gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="可提现金币"
android:textColor="#ffffffff"
android:textSize="14sp" />
<TextView
android:id="@+id/coinLabel"
android:layout_width="wrap_content"
@@ -30,14 +38,6 @@
android:text="0"
android:textColor="#ffffffff"
android:textSize="32sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="我的金币"
android:textColor="#ffffffff"
android:textSize="14sp" />
</LinearLayout>
<TextView
@@ -109,8 +109,10 @@
<TextView
android:id="@+id/bindBtn"
android:layout_width="82dp"
android:layout_height="match_parent"
android:layout_height="@dimen/dp30"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp5"
android:background="@drawable/shape_button_enable"
android:gravity="center"
android:text="去绑定"

View File

@@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="50dp"
android:paddingBottom="50dp"
android:background="@drawable/bg_rank"
tools:viewBindingIgnore="true">
<androidx.viewpager.widget.ViewPager

View File

@@ -5,7 +5,7 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<RelativeLayout
@@ -17,9 +17,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@drawable/bg_dibu"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp280"
android:scaleType="fitEnd"
android:layout_below="@+id/daka_rank_header_layout"
android:src="@drawable/bg_dibu"/>
<FrameLayout
android:id="@+id/fl_top"
android:layout_width="match_parent"
@@ -61,7 +67,7 @@
android:layout_marginTop="26dp"
fresco:placeholderImage="@color/mainBg"
fresco:roundAsCircle="true"
fresco:roundingBorderColor="@color/white"
fresco:roundingBorderColor="#D8DFE5"
fresco:roundingBorderWidth="2dp" />
<TextView
@@ -114,7 +120,7 @@
android:layout_marginTop="26dp"
fresco:placeholderImage="@color/mainBg"
fresco:roundAsCircle="true"
fresco:roundingBorderColor="@color/white"
fresco:roundingBorderColor="#FBD06A"
fresco:roundingBorderWidth="2dp" />
<TextView
@@ -178,7 +184,7 @@
android:layout_marginTop="26dp"
fresco:placeholderImage="@color/mainBg"
fresco:roundAsCircle="true"
fresco:roundingBorderColor="@color/white"
fresco:roundingBorderColor="#F5C6B4"
fresco:roundingBorderWidth="2dp" />
<TextView
@@ -289,7 +295,7 @@
android:background="@drawable/shape_daka_rank_frame1"
android:gravity="center"
android:text="日榜"
android:textColor="#8646F6"
android:textColor="#EB6DD2"
android:textSize="14sp"
android:textStyle="bold" />
@@ -343,7 +349,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/ll_topview"
android:layout_marginTop="-20dp"
android:layout_marginTop="-50dp"
android:layout_marginHorizontal="@dimen/dp10"
android:background="@drawable/top_corner_bg"
android:divider="@color/transparent"
android:paddingTop="20dp"

View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true"
android:layout_height="match_parent"
android:background="#F6F7FB"
android:layout_marginBottom="50dp">
<androidx.viewpager.widget.ViewPager

View File

@@ -4,21 +4,136 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="#F6F7FB"
tools:context=".view.luck.LuckFragment">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp240"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="55dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp85"
android:layout_marginTop="25dp"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/lin_video_speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp20"
android:layout_marginRight="@dimen/dp8"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video_bg" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="视频互动"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="1v1倾诉陪伴"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/lin_voice_speed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp8"
android:layout_marginRight="@dimen/dp20"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio_bg" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="语音匹配"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="遇见合适的灵魂"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/rl_main_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:background="@color/white"
android:layout_marginTop="@dimen/dp10"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="16dp"
@@ -75,53 +190,52 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="新人"
android:textColor="@color/one_text"
android:textColor="@color/black"
android:textSize="16sp" />
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout
<RelativeLayout
android:id="@+id/title_view_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginEnd="14dp">
<ImageView
android:id="@+id/title_bottom_line_2"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_below="@+id/tv_2"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp5"
android:src="@drawable/shape_button_enable"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/tv_2"
app:layout_constraintEnd_toEndOf="@+id/tv_2"
app:layout_constraintStart_toStartOf="@+id/tv_2"
app:layout_constraintTop_toTopOf="@+id/tv_2" />
<ImageView
android:id="@+id/iv_luck_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_luck_location"
app:layout_constraintBottom_toBottomOf="@+id/tv_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_2" />
/>
<TextView
android:id="@+id/tv_2"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:gravity="center"
android:text="附近"
android:textColor="@color/one_text"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_luck_location"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_toRightOf="@+id/iv_luck_location"
android:orientation="vertical">
<TextView
android:id="@+id/tv_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:gravity="center"
android:text="附近"
android:textColor="@color/one_text"
android:textSize="16sp"
/>
<ImageView
android:id="@+id/title_bottom_line_2"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:src="@drawable/shape_button_enable"
android:layout_gravity="center"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
<Space
android:layout_width="0dp"
@@ -146,7 +260,7 @@
android:id="@+id/iv_luck_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_luck_search" />
android:src="@drawable/ic_home_search" />
</LinearLayout>
<androidx.viewpager.widget.ViewPager

View File

@@ -5,166 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F6F7FB"
android:orientation="vertical"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/ctl_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp20"
android:layout_marginTop="@dimen/dp20"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/rl_video_pp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp8"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video_bg" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="视频互动"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="1v1倾诉陪伴"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_audio_pp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp8"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio_bg" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="匿名匹配"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="遇见合适的灵魂"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_main_home_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dp45"
android:layout_marginTop="@dimen/dp20"
android:orientation="vertical"/>
<!--<include
layout="@layout/item_main_home_page_layout"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp45"
android:layout_marginTop="@dimen/dp20"/>-->
</LinearLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
@@ -172,6 +13,185 @@
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_bg" />
<RelativeLayout
android:id="@+id/ll_main_home_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dp45"
android:layout_marginTop="@dimen/dp20"
android:orientation="horizontal"
tools:viewBindingIgnore="true">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_marginStart="16dp"
android:layout_toStartOf="@+id/iv_title_rank"
android:orientation="horizontal">
<RelativeLayout
android:id="@+id/title_view_1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="20dp">
<ImageView
android:id="@+id/title_bottom_line_1"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/title_name_1"
android:src="@drawable/shape_button_enable" />
<TextView
android:id="@+id/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/title_view_2"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="20dp">
<ImageView
android:id="@+id/title_bottom_line_2"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/title_name_2"
android:src="@drawable/shape_button_enable" />
<TextView
android:id="@+id/title_name_2"
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/title_view_3"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<ImageView
android:id="@+id/title_bottom_line_3"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/title_name_3"
android:src="@drawable/shape_button_enable" />
<TextView
android:id="@+id/title_name_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="新人"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
<ImageView
android:id="@+id/iv_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="20dp"
android:layout_marginEnd="2dp"
android:src="@mipmap/icon_address" />
<LinearLayout
android:id="@+id/title_view_4"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent">
<ImageView
android:id="@+id/title_bottom_line_4"
android:layout_width="@dimen/dp20"
android:layout_height="@dimen/dp5"
android:layout_centerHorizontal="true"
android:layout_below="@+id/title_name_4"
android:src="@drawable/shape_button_enable" />
<TextView
android:id="@+id/title_name_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:ellipsize="end"
android:singleLine="true"
android:text="同城"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp4"
android:visibility="gone">
<ImageView
android:id="@+id/iv_more_city"
android:layout_width="@dimen/dp12"
android:layout_height="@dimen/dp6"
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/dp2"
android:src="@drawable/ic_bou_mo1" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/iv_title_rank"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="12dp"
android:layout_toStartOf="@+id/iv_title_gender"
android:src="@drawable/ic_home_rank" />
<ImageView
android:id="@+id/iv_title_gender"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/iv_title_search"
android:src="@drawable/ic_home_hi" />
<ImageView
android:id="@+id/iv_title_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="12dp"
android:layout_marginEnd="16dp"
android:src="@drawable/ic_home_search" />
</RelativeLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/ll_main_home_title"
android:background="@color/transparent"/>
<LinearLayout
android:id="@+id/main_turntable"
@@ -224,28 +244,4 @@
android:src="@drawable/ic_video_endw" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/main_first_chong_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/dp80"
android:visibility="gone">
<ImageView
android:id="@+id/main_first_chong"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/iv_first_chong" />
<ImageView
android:id="@+id/main_first_chong_end"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_alignRight="@id/main_first_chong"
android:layout_marginRight="5dp"
android:src="@drawable/ic_video_endw" />
</RelativeLayout>
</RelativeLayout>

View File

@@ -4,12 +4,13 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
android:background="@color/transparent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"

View File

@@ -4,13 +4,14 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
android:background="@color/transparent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"

View File

@@ -4,12 +4,13 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
android:background="@color/transparent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"

View File

@@ -36,6 +36,7 @@
android:background="@color/three_text"
android:clipChildren="false" />
<LinearLayout
android:id="@+id/view_group"
android:layout_width="match_parent"
@@ -44,6 +45,15 @@
android:layout_marginTop="-25dp"
android:gravity="center"
android:orientation="horizontal" />
<ImageView
android:id="@+id/personal_main_page_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp15"
android:layout_alignBottom="@+id/view_group"
android:src="@mipmap/icon_status1" />
</RelativeLayout>
<RelativeLayout
@@ -240,32 +250,32 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_toEndOf="@+id/personal_main_page_age"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="4dp">
android:layout_below="@+id/personal_main_page_name">
<ImageView
android:id="@+id/tagVipImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/tag_member"
android:layout_marginRight="4dp"
android:visibility="gone" />
<ImageView
android:id="@+id/tagSVipImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:src="@mipmap/tag_supermember"
android:layout_marginRight="4dp"
android:visibility="gone" />
<ImageView
android:id="@+id/tagNewImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginRight="4dp"
android:src="@mipmap/tag_new"
android:visibility="gone" />
@@ -273,7 +283,7 @@
android:id="@+id/tagRealImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginRight="4dp"
android:src="@mipmap/ag_real"
android:visibility="gone" />
@@ -281,7 +291,6 @@
android:id="@+id/tagPhoneImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:src="@mipmap/tag_phone"
android:visibility="gone" />
</LinearLayout>
@@ -290,22 +299,13 @@
android:id="@+id/personal_main_page_sub_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/personal_main_page_name"
android:layout_below="@+id/tagContainer"
android:layout_marginTop="6dp"
android:text="深圳 | 女神值289"
android:textColor="#848484"
android:textSize="14sp" />
<ImageView
android:id="@+id/personal_main_page_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/personal_main_page_sub_info"
android:layout_alignParentBottom="@+id/personal_main_page_sub_info"
android:layout_marginStart="10dp"
android:layout_marginEnd="16dp"
android:layout_toEndOf="@+id/personal_main_page_sub_info"
android:src="@mipmap/icon_status1" />
<TextView
android:id="@+id/tv_signer"

View File

@@ -4,12 +4,13 @@
android:id="@+id/channel_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent"
tools:viewBindingIgnore="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white">
android:background="@color/transparent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/channel_app_bar"

View File

@@ -721,6 +721,7 @@
android:layout_gravity="center"
android:gravity="center"
android:layout_weight="1"
android:visibility="gone"
android:orientation="vertical">
<ImageView

View File

@@ -34,9 +34,9 @@
android:id="@+id/dynamic_list_photo"
android:layout_width="40dp"
android:layout_height="40dp"
fresco:roundedCornerRadius="24dp"
fresco:roundingBorderColor="#6CE4B7"
fresco:roundingBorderWidth="@dimen/dp1"
fresco:roundedCornerRadius="24dp" />
fresco:roundingBorderWidth="@dimen/dp1" />
<ImageView
android:id="@+id/iv_sex"
@@ -261,45 +261,46 @@
android:weightSum="3" />
<RelativeLayout
android:id="@+id/rl_bottom_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/dynamic_list_image_list_3"
android:layout_marginHorizontal="@dimen/dp16"
android:layout_marginTop="15dp"
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"/>
android:paddingHorizontal="@dimen/dp10"
android:paddingVertical="@dimen/dp2"
android:text="# 只想发个自拍"
android:textColor="#E472ED"
android:textSize="@dimen/dp12"
android:visibility="gone" />
<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"/>
android:textColor="#E472ED"
android:textSize="@dimen/dp12" />
<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_gravity="center"
android:layout_marginTop="@dimen/dp15"
android:gravity="center"
android:background="@drawable/shape_button_enable"
android:gravity="center"
android:orientation="horizontal">
<ImageView
@@ -310,8 +311,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="打赏"
android:layout_marginLeft="@dimen/dp5"
android:text="打赏"
android:textColor="@color/white"
android:textSize="@dimen/dp12"
android:textStyle="bold" />
@@ -371,9 +372,9 @@
<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_below="@+id/item_dynamic_gift_layout"
android:layout_marginTop="13dp"
android:background="@color/mainBg"
android:visibility="gone" />
android:layout_below="@+id/rl_bottom_layout"
android:layout_marginTop="@dimen/dp15"
android:background="#F6F7FB"
android:visibility="visible" />
</RelativeLayout>
</LinearLayout>

View File

@@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="关注"
android:textColor="@color/grey_text"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
@@ -92,7 +92,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="同城"
android:textColor="@color/grey_text"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
@@ -120,6 +120,7 @@
android:id="@+id/dynamic_title_view_4"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp20"
android:layout_toEndOf="@+id/dynamic_title_view_3">

View File

@@ -11,18 +11,19 @@
<com.flyco.roundview.RoundRelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginHorizontal="@dimen/dp20"
android:clipChildren="false"
android:padding="12dp"
app:rv_backgroundColor="@color/white"
app:rv_cornerRadius="8dp">
android:paddingVertical="@dimen/dp12"
app:rv_cornerRadius="10dp">
<com.facebook.drawee.view.SimpleDraweeView
android:layout_marginLeft="@dimen/dp15"
android:id="@+id/user_head"
android:layout_width="72dp"
android:layout_height="72dp"
app:roundedCornerRadius="8dp" />
app:roundedCornerRadius="8dp"
app:roundAsCircle="true"/>
<com.flyco.roundview.RoundTextView
android:id="@+id/iv_status"
@@ -162,36 +163,34 @@
<TextView
android:id="@+id/iv_luck_hi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/user_head"
android:layout_alignParentEnd="true"
android:drawableTop="@mipmap/ic_main_luck_hi"
android:drawablePadding="2dp"
android:layout_width="@dimen/dp60"
android:layout_height="@dimen/dp30"
android:textSize="@dimen/dp12"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp15"
android:gravity="center"
android:text="打招呼"
android:textColor="#935CF8"
android:textSize="10dp" />
android:textColor="#E472ED"
android:background="@drawable/shape_button_e472ed_border"
android:text="聊一聊"/>
<TextView
android:id="@+id/iv_luck_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/user_head"
android:layout_alignParentEnd="true"
android:drawableTop="@mipmap/ic_main_luck_msg"
android:drawablePadding="2dp"
android:layout_width="@dimen/dp60"
android:layout_height="@dimen/dp30"
android:textSize="@dimen/dp12"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp15"
android:gravity="center"
android:text="私信"
android:textColor="#935CF8"
android:textSize="10dp"
android:visibility="gone" />
android:textColor="#E472ED"
android:background="@drawable/shape_button_e472ed_border"
android:visibility="gone"
android:text="聊一聊" />
</com.flyco.roundview.RoundRelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="76dp"
android:layout_marginEnd="16dp"
android:background="#FDEFF6" />
android:layout_height="@dimen/dp12"
android:background="#F6F7FB" />
</LinearLayout>

View File

@@ -3,7 +3,6 @@
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">

View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/transparent"
android:orientation="horizontal"
tools:viewBindingIgnore="true">

View File

@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="通话"
android:textColor="@color/grey_text"
android:textColor="@color/one_text"
android:textSize="16dp" />
</RelativeLayout>
</LinearLayout>

View File

@@ -3,7 +3,7 @@
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:layout_height="@dimen/dp45"
android:background="@color/transparent"
tools:viewBindingIgnore="true">

View File

@@ -121,6 +121,7 @@
android:text="发消息"
android:textColor="@android:color/white"
android:textSize="14sp"
android:background="@drawable/bg_focus"
android:visibility="gone" />
<TextView

View File

@@ -1,93 +1,112 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout 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="wrap_content"
android:background="@color/transparent">
android:layout_height="@dimen/dp85"
android:background="@color/transparent"
android:layout_marginHorizontal="@dimen/dp20"
android:layout_marginTop="@dimen/dp20"
android:orientation="horizontal">
<androidx.constraintlayout.widget.ConstraintLayout
<RelativeLayout
android:id="@+id/lin_video_speed"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="10dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/lin_voice_speed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_marginLeft="@dimen/dp20"
android:layout_marginRight="@dimen/dp8"
android:layout_weight="1">
<ImageView
android:id="@+id/iv_luck_video_speed_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@mipmap/icon_main_video_speed_man" />
android:src="@drawable/ic_home_top_video_bg" />
<TextView
android:id="@+id/tv_video_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="视频速配"
android:textColor="@color/white"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_video_detail"
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_video" />
<TextView
android:id="@+id/tv_video_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="真人视频通话"
android:textColor="#ccffffff"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_video_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="视频互动"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="1v1倾诉陪伴"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/lin_voice_speed"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/lin_video_speed"
app:layout_constraintTop_toTopOf="parent">
android:layout_marginLeft="@dimen/dp8"
android:layout_marginRight="@dimen/dp20"
android:layout_weight="1">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@mipmap/icon_main_voice_speed" />
android:src="@drawable/ic_home_top_audio_bg" />
<TextView
android:id="@+id/tv_voice_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="12dp"
android:text="语音速配"
android:textColor="@color/white"
android:textSize="14dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_voice_detail"
app:layout_constraintStart_toStartOf="parent" />
<ImageView
android:layout_width="@dimen/dp85"
android:layout_height="@dimen/dp85"
android:layout_alignParentRight="true"
android:scaleType="fitXY"
android:src="@drawable/ic_home_top_audio" />
<TextView
android:id="@+id/tv_voice_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="真人语音通话"
android:textColor="#ccffffff"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_voice_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp65"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp10"
android:text="语音匹配"
android:textColor="@color/white"
android:textSize="@dimen/dp18"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp2"
android:text="遇见合适的灵魂"
android:textColor="@color/white"
android:textSize="@dimen/dp12" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 949 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

View File

@@ -7,7 +7,7 @@
<!--登陆页用色-->
<color name="loginLine">#cccccc</color>
<color name="loginText">#333333</color>
<color name="loginText">#000000</color>
<color name="mainColor">#E472ED</color>
<color name="loginText2">#999999</color>
<color name="loginGradientStart">#2bb1f8</color>
@@ -39,8 +39,8 @@
<color name="giftText1">#FF828B</color>
<color name="giftText2">#F32B2B</color>
<color name="verfyNotificationBackground">#F94F2E</color>
<color name="daka1">#D975FF</color>
<color name="daka2">#744DF8</color>
<color name="daka1">#EB6EEC</color>
<color name="daka2">#EC696F</color>
<color name="invitation1">#4769FF</color>
<color name="invitation2">#8517DD</color>
<color name="gender_selected">#FE747B</color>
@@ -52,7 +52,7 @@
<color name="color_2d2d2d">#000000</color>
<!--一级文字-->
<color name="one_text">#333333</color>
<color name="one_text">#000000</color>
<!--二级文字-->
<color name="two_text">#666666</color>
<!--三级文字-->
@@ -60,7 +60,7 @@
<!--分割线-->
<color name="cut_line">#eeeeee</color>
<!--芊颜主题色-->
<color name="yellow_ffd33e">#6B2CC4</color>
<color name="yellow_ffd33e">#EB6DD2</color>
<!--芊颜一级文字-->
<color name="zhimi_one_text">#111111</color>