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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
androidTwo@admin.com
2026-04-03 22:36:11 +08:00
parent 806c537b48 48ee31e542
commit c8cc7bbdfe
25 changed files with 2287 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/shape_search_layout.xml
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="90dp"/>
<solid android:color="#33FFFFFF"/>
<solid android:color="#33999999"/>
</shape>

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

@@ -3,7 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:viewBindingIgnore="true">
tools:viewBindingIgnore="true"
android:background="@color/white">
<com.fengliyan.uikit.refresh.LoadMoreListView
android:id="@+id/search_list"
@@ -13,6 +14,7 @@
android:dividerHeight="0dp" />
<RelativeLayout
android:visibility="gone"
android:id="@+id/search_option_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">

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

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:layout_marginBottom="50dp">
<LinearLayout
android:layout_marginLeft="@dimen/dp12"
android:id="@+id/rl_head"
android:layout_marginTop="24dp"
android:layout_width="match_parent"
android:layout_height="@dimen/dp48">
<net.lucode.hackware.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_gravity="center_vertical" />
<RelativeLayout
android:id="@+id/rl_home_search"
android:layout_width="@dimen/dp44"
android:layout_height="match_parent">
<ImageView
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_home_search" />
</RelativeLayout>
</LinearLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/dynamic_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/rl_head" />
<ImageView
android:id="@+id/addFeedBtn"
android:layout_margin="24dp"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:src="@mipmap/feed_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</RelativeLayout>

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

@@ -45,7 +45,6 @@
<RelativeLayout
android:id="@+id/rl_home_change"
android:layout_alignParentRight="true"
android:layout_width="@dimen/dp32"
android:layout_height="match_parent">
@@ -58,7 +57,6 @@
<RelativeLayout
android:id="@+id/rl_home_search"
android:layout_alignParentRight="true"
android:layout_width="@dimen/dp32"
android:layout_height="match_parent">

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

@@ -160,6 +160,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:drawableRight="@mipmap/ic_id_copy"
android:drawablePadding="4dp"
android:text="ID:"
android:textColor="#524B52"
android:textSize="12dp"
@@ -183,7 +185,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:layout_marginTop="8dp"
android:text="距下一级还差100财富值"
android:textColor="#9A989D"
android:textSize="12dp"
@@ -688,7 +690,7 @@
android:layout_marginTop="-20dp"
android:background="@drawable/shape_white_bg_r14"
android:orientation="horizontal"
android:weightSum="4">
android:weightSum="3">
<LinearLayout
android:id="@+id/ll_income"
@@ -746,7 +748,6 @@
android:layout_gravity="center"
android:gravity="center"
android:layout_weight="1"
android:visibility="gone"
android:orientation="vertical">
<ImageView

656
app/src/main/res/layout/fragment_setting2.xml Normal file
View File

@@ -0,0 +1,656 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView 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="#F4F5F7"
android:fillViewport="true"
tools:viewBindingIgnore="true">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
android:src="@drawable/icon_setting_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rl_user_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginTop="50dp"
android:layout_marginRight="12dp">
<RelativeLayout
android:id="@+id/rl_user_head"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/user_head"
android:layout_width="@dimen/dp75"
android:layout_height="@dimen/dp75"
android:layout_centerInParent="true"
android:scaleType="fitXY"
app:roundAsCircle="true"
app:roundingBorderColor="@color/white"
app:roundingBorderWidth="2dp" />
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/user_avatar_frame"
android:layout_width="@dimen/dp75"
android:layout_height="@dimen/dp75"
android:layout_centerInParent="true"
android:layout_marginTop="-4dp"
android:scaleType="fitXY"
android:src="@mipmap/privilege_avatar_border_man1"
android:visibility="gone" />
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/svga_image_view"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_centerInParent="true"
android:layout_marginTop="-4dp"
android:background="@color/transparent"
android:visibility="gone" />
<ImageView
android:layout_width="@dimen/dp75"
android:layout_height="@dimen/dp75"
android:layout_centerInParent="true"
android:scaleType="fitXY"
android:src="@mipmap/ic_tmbg_avatar" />
<TextView
android:id="@+id/tv_go_homepage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp58"
android:text="主页"
android:textColor="@color/white"
android:textSize="9dp" />
</RelativeLayout>
<TextView
android:id="@+id/tv_nick_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:gravity="center"
android:text=""
android:textColor="#000000"
android:textSize="@dimen/dp20"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_qingyu_id"
app:layout_constraintStart_toEndOf="@+id/rl_user_head"
app:layout_constraintTop_toTopOf="parent"
tools:text="aaa" />
<TextView
android:id="@+id/tv_age"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:background="@drawable/bg_btn_woman"
android:drawableStart="@drawable/icon_women"
android:paddingStart="5dp"
android:paddingTop="1dp"
android:paddingEnd="5dp"
android:paddingBottom="1dp"
android:textColor="@color/white"
android:textSize="10dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/tv_nick_name"
app:layout_constraintStart_toEndOf="@+id/tv_nick_name"
app:layout_constraintTop_toTopOf="@+id/tv_nick_name"
tools:text="123" />
<LinearLayout
android:id="@+id/ll_level"
android:layout_width="@dimen/dp44"
android:layout_height="@dimen/dp22"
android:layout_marginStart="@dimen/dp10"
android:background="@drawable/bg_level"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@+id/tv_nick_name"
app:layout_constraintStart_toEndOf="@+id/tv_nick_name"
app:layout_constraintTop_toTopOf="@+id/tv_nick_name">
<ImageView
android:layout_width="@dimen/dp8"
android:layout_height="@dimen/dp5"
android:layout_gravity="center"
android:src="@mipmap/ic_mine_jt_s" />
<TextView
android:id="@+id/tv_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp5"
android:text="1"
android:textColor="@color/white"
android:textSize="11dp" />
</LinearLayout>
<TextView
android:id="@+id/tv_qingyu_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:drawableRight="@mipmap/ic_id_copy"
android:drawablePadding="4dp"
android:text="ID:"
android:textColor="#524B52"
android:textSize="12dp"
app:layout_constraintBottom_toTopOf="@+id/vv"
app:layout_constraintStart_toEndOf="@+id/rl_user_head"
app:layout_constraintTop_toBottomOf="@+id/tv_nick_name" />
<View
android:id="@+id/vv"
android:layout_width="@dimen/dp120"
android:layout_height="@dimen/dp4"
android:layout_marginStart="16dp"
android:layout_marginTop="@dimen/dp6"
android:background="#33999999"
app:layout_constraintBottom_toBottomOf="@+id/tv_qingyu_id"
app:layout_constraintStart_toEndOf="@+id/rl_user_head"
app:layout_constraintTop_toBottomOf="@+id/tv_qingyu_id" />
<TextView
android:id="@+id/tv_jy_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="距下一级还差100财富值"
android:textColor="#9A989D"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/rl_user_head"
app:layout_constraintTop_toBottomOf="@+id/tv_qingyu_id" />
<LinearLayout
android:id="@+id/lin_user_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/rl_user_head"
app:layout_constraintTop_toBottomOf="@+id/tv_qingyu_id">
<ImageView
android:id="@+id/iv_user_icon1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:src="@drawable/setting_my_icon1" />
<ImageView
android:id="@+id/iv_user_icon2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:src="@drawable/setting_my_icon2" />
<ImageView
android:id="@+id/iv_user_icon3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:src="@drawable/setting_my_icon3" />
<ImageView
android:id="@+id/iv_user_icon4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/setting_my_icon4" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_go_edit_layout"
android:layout_width="@dimen/dp57"
android:layout_height="@dimen/dp25"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="@drawable/bg_fff_t50"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="编辑"
android:textColor="#666666"
android:textSize="12dp" />
<ImageView
android:layout_width="@dimen/dp14"
android:layout_height="@dimen/dp14"
android:layout_marginLeft="@dimen/dp6"
android:background="@mipmap/girlauth_right" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/rl_user_info"
android:layout_marginTop="20dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_foucs"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="bottom"
android:orientation="vertical">
<TextView
android:id="@+id/tv_foucus_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text=""
android:textColor="@color/black"
android:textSize="20dp"
android:textStyle="bold"
tools:text="111" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="4dp"
android:text="关注"
android:textColor="#9A989D"
android:textSize="12dp" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_fans"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone">
<TextView
android:id="@+id/tv_fans_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text=""
android:textColor="@color/black"
android:textSize="20dp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/tv_fans"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/rtv_new_fans_num"
tools:text="11" />
<com.flyco.roundview.RoundTextView
android:id="@+id/rtv_new_fans_num"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginStart="1dp"
android:gravity="center"
android:text=""
android:textColor="@color/white"
android:textSize="8sp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/tv_fans_num"
app:layout_constraintTop_toTopOf="parent"
app:rv_backgroundColor="@color/mainColor"
app:rv_cornerRadius="7dp" />
<TextView
android:id="@+id/tv_fans"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="4dp"
android:text="粉丝"
android:textColor="#9A989D"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_fans_num" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ll_scan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:id="@+id/tv_scan_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="8dp"
android:text="0"
android:textColor="@color/black"
android:textSize="20dp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/rtv_new_scan_num"
tools:text="22" />
<com.flyco.roundview.RoundTextView
android:id="@+id/rtv_new_scan_num"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_toEndOf="@id/ll_scan"
android:gravity="center"
android:text=""
android:textColor="@color/white"
android:textSize="8sp"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/tv_scan_num"
app:layout_constraintTop_toTopOf="parent"
app:rv_backgroundColor="@color/mainColor"
app:rv_cornerRadius="7dp" />
<TextView
android:id="@+id/tv_scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="4dp"
android:text="访客"
android:textColor="#9A989D"
android:textSize="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_scan_num" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_foot"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="bottom"
android:orientation="vertical">
<TextView
android:id="@+id/tv_foot_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="0"
android:textColor="@color/black"
android:textSize="20dp"
android:textStyle="bold"
tools:text="12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="4dp"
android:text="足迹"
android:textColor="#9A989D"
android:textSize="12dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/cl_income"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="bottom"
android:orientation="vertical">
<TextView
android:id="@+id/tv_income_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="0"
android:textColor="@color/black"
android:textSize="20dp"
android:textStyle="bold"
tools:text="12" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="4dp"
android:text="金币"
android:textColor="#9A989D"
android:textSize="12dp" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_vip"
android:layout_width="match_parent"
android:layout_height="@dimen/dp85"
android:layout_marginHorizontal="@dimen/dp20"
android:layout_marginTop="@dimen/dp20"
android:visibility="visible">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp85"
android:scaleType="fitXY"
android:src="@mipmap/ic_vip_mine_bg" />
<ImageView
android:id="@+id/iv_xsimg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp20"
android:layout_marginTop="@dimen/dp15"
android:src="@mipmap/ic_vip_xs_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp15"
android:layout_toRightOf="@+id/iv_xsimg"
android:text="特权"
android:textColor="#FDFAD9"
android:textSize="16dp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/iv_xsimg"
android:layout_marginLeft="@dimen/dp20"
android:layout_marginTop="4dp"
android:text="享受多种福利特权，提升使用体验"
android:textColor="#FDFAD9"
android:textSize="12dp" />
<TextView
android:id="@+id/tv_go_open"
android:layout_width="@dimen/dp75"
android:layout_height="@dimen/dp28"
android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp17"
android:layout_marginEnd="@dimen/dp20"
android:background="@mipmap/ic_vip_go_btn"
android:gravity="center"
android:singleLine="true"
android:text="立即开通"
android:textColor="#FDFAD9"
android:textSize="12dp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp100"
android:layout_marginHorizontal="@dimen/dp20"
android:layout_marginTop="-20dp"
android:background="@drawable/shape_white_bg_r14"
android:orientation="horizontal"
android:weightSum="3">
<LinearLayout
android:id="@+id/ll_income"
android:layout_width="@dimen/dp0"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp44"
android:layout_height="@dimen/dp44"
android:src="@mipmap/iv_recharge_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="充值"
android:textColor="@color/black"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_fu"
android:layout_width="@dimen/dp0"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:layout_weight="1"
android:visibility="gone"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp44"
android:layout_height="@dimen/dp44"
android:src="@mipmap/iv_fu_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="FU圈"
android:textColor="@color/black"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_mine_video_chat"
android:layout_width="@dimen/dp0"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp44"
android:layout_height="@dimen/dp44"
android:src="@mipmap/icon_my_video" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="视频聊天"
android:textColor="@color/black"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/cl_invite"
android:layout_width="@dimen/dp0"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:layout_weight="1"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp44"
android:layout_height="@dimen/dp44"
android:src="@mipmap/iv_invite_img" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="邀请有礼"
android:textColor="@color/black"
android:textSize="14dp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/lin_my_list1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="16dp"
android:background="@drawable/shape_recommend_bg"
android:orientation="vertical" />
<LinearLayout
android:id="@+id/lin_my_list2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="62dp"
android:background="@drawable/shape_recommend_bg"
android:orientation="vertical" />
</LinearLayout>
</RelativeLayout>
</androidx.core.widget.NestedScrollView>

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

@@ -270,18 +270,6 @@
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/tv_topic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/shape_button_e472ed_t10"
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"
@@ -291,84 +279,82 @@
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"
<RelativeLayout
android:layout_marginTop="16dp"
android:layout_below="@+id/tv_see_count"
android:layout_alignParentRight="true"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp15"
android:background="@drawable/shape_button_enable"
android:gravity="center"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
<LinearLayout
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_dynamic_gift_img" />
android:layout_marginStart="16dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp5"
android:text="打赏"
android:textColor="@color/white"
android:textSize="@dimen/dp12"
android:textStyle="bold" />
</LinearLayout>
<ImageView
android:id="@+id/likeImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/feed_heart" />
<TextView
android:layout_marginLeft="4dp"
android:id="@+id/likeCountLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="0"
android:textColor="@color/grey_text"
android:textSize="14sp" />
<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:layout_marginLeft="4dp"
android:id="@+id/commentCountLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="0"
android:textColor="@color/grey_text"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/item_dynamic_gift_layout"
android:layout_width="@dimen/dp60"
android:layout_height="@dimen/dp26"
android:layout_alignParentRight="true"
android:layout_gravity="center"
android:background="@drawable/shape_button_enable"
android:gravity="center"
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:layout_marginLeft="@dimen/dp5"
android:text="打赏"
android:textColor="@color/white"
android:textSize="@dimen/dp12"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>
</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"

18
app/src/main/res/layout/item_search_title.xml
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/yellow_ffd33e"
android:background="@color/white"
tools:viewBindingIgnore="true">
<LinearLayout
@@ -24,7 +24,7 @@
android:layout_height="@dimen/dp50"
android:layout_centerInParent="true"
android:layout_marginLeft="@dimen/dp16"
android:src="@drawable/ic_return_white" />
android:src="@drawable/ic_return" />
</RelativeLayout>
<!-- <EditText
@@ -44,22 +44,26 @@
android:lines="1"
android:maxLines="1"/>-->
<EditText
android:paddingLeft="20dp"
android:layout_marginRight="@dimen/dp20"
android:id="@+id/search_title_input"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="@dimen/dp36"
android:layout_gravity="center_vertical"
android:background="@null"
android:background="@drawable/shape_search_layout"
android:gravity="center_vertical"
android:hint="搜索用户号或者昵称"
android:imeOptions="actionSearch"
android:lines="1"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:textColor="@color/one_text"
android:textColorHint="@color/three_text"
android:textCursorDrawable="@null"
android:textSize="16sp" />
android:textSize="12sp" />
</LinearLayout>
<!--<TextView-->

BIN
app/src/main/res/mipmap-xhdpi/ic_do_not_model.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_id_copy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_my_intimacy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_set_friend.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_wallet.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 832 B