feat: 个人页+顶部栏高度方法调整

app/src/main/java/com/adealink/weparty/commonui/widget/CommonTabLayout.kt

@@ -9,10 +9,9 @@ import android.util.TypedValue
 import android.view.GestureDetector
 import android.view.LayoutInflater
 import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.updateLayoutParams
 import androidx.viewpager2.widget.ViewPager2
 import com.adealink.frame.aab.util.getCompatColor
 import com.adealink.frame.util.DisplayUtil
@@ -39,6 +38,11 @@ class CommonTabLayout @JvmOverloads constructor(
         private const val MODE_AUTO = 2
         private const val TYPE_WRAP_CONTENT = 0
         private const val TYPE_MATCH_PARENT = 1
+
+
+        private const val INDICATOR_WIDTH_MATCH_PARENT = 0 //铺满整个tab
+        private const val INDICATOR_WIDTH_WRAP_TEXT = 1 //包裹文字
+        private const val INDICATOR_WIDTH_FIXED = 2 //固定大小
     }
 
     private var binding: LayoutCommonTabLayoutBinding =
@@ -50,6 +54,13 @@ class CommonTabLayout @JvmOverloads constructor(
     private var normalTabTextSize = 16f.dpf()
     private var selectedTabTextSize = 16f.dpf()
     private var indicatorColor: Int = 0
+    private var indicatorDrawable: Drawable? = null
+
+    private var indicatorWidthMode: Int = INDICATOR_WIDTH_MATCH_PARENT
+
+    private var indicatorWidth: Float? = null //仅INDICATOR_WIDTH_FIXED生效
+
+    private var indicatorHeight: Float = 2.dpf()
     private var selectedTabColor: Int = 0
     private var selectedTabBg: Drawable? = null
     private var normalTabColor: Int = 0
@@ -57,7 +68,7 @@ class CommonTabLayout @JvmOverloads constructor(
     private var tabPaddingHorizontal: Int = 4.dp()
     private var tabPaddingVertical: Int = 0
     private var fixedTabScrollableMode: Boolean = false
-    private var scrollToTop: (()->Unit)? = null
+    private var scrollToTop: (() -> Unit)? = null
     private val gestureDetector: GestureDetector by lazy {
         GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
             override fun onDoubleTap(e: MotionEvent): Boolean {
@@ -94,6 +105,21 @@ class CommonTabLayout @JvmOverloads constructor(
             R.styleable.CommonTabLayout_indicator_color,
             getCompatColor(R.color.color_222222)
         )
+        indicatorDrawable = typedArray.getDrawable(
+            R.styleable.CommonTabLayout_indicator_drawable
+        )
+        indicatorWidthMode = typedArray.getInt(
+            R.styleable.CommonTabLayout_indicator_width_mode,
+            INDICATOR_WIDTH_MATCH_PARENT
+        )
+        indicatorWidth = typedArray.getDimension(
+            R.styleable.CommonTabLayout_indicator_width,
+            0f,
+        )
+        indicatorHeight = typedArray.getDimension(
+            R.styleable.CommonTabLayout_indicator_height,
+            1.dpf(),
+        )
         normalTabColor = typedArray.getColor(
             R.styleable.CommonTabLayout_normal_tab_color,
             getCompatColor(R.color.color_tab_normal_match_parent)
@@ -149,7 +175,7 @@ class CommonTabLayout @JvmOverloads constructor(
                     totalTabWidth += it.width
 
                     // 为每个 TabItem 设置固定间距
-                    val layoutParams = it.layoutParams as ViewGroup.MarginLayoutParams
+                    val layoutParams = it.layoutParams as MarginLayoutParams
                     layoutParams.setMargins(0, 0, spacing, 0)
                     it.layoutParams = layoutParams
                 }
@@ -176,7 +202,11 @@ class CommonTabLayout @JvmOverloads constructor(
         this.indicatorColor = indicatorColor
         for (i in 0 until tabLayout.tabCount) {
             tabLayout.getTabAt(i)?.let {
-                updateTabView(it, viewPager2?.currentItem == i, tabFragmentStateAdapter?.getTabName(i))
+                updateTabView(
+                    it,
+                    viewPager2?.currentItem == i,
+                    tabFragmentStateAdapter?.getTabName(i)
+                )
             }
         }
     }
@@ -232,9 +262,9 @@ class CommonTabLayout @JvmOverloads constructor(
     private fun setRootWidthWithTabType(type: Int) {
         val lp = binding.root.layoutParams
         if (type == TYPE_WRAP_CONTENT) {
-            lp.width = ViewGroup.LayoutParams.WRAP_CONTENT
+            lp.width = LayoutParams.WRAP_CONTENT
         } else {
-            lp.width = ViewGroup.LayoutParams.MATCH_PARENT
+            lp.width = LayoutParams.MATCH_PARENT
         }
         binding.root.layoutParams = lp
     }
@@ -293,7 +323,7 @@ class CommonTabLayout @JvmOverloads constructor(
         name: String? = null,
         showIndicator: Boolean = true,
     ) {
-        val indicatorBackground = DrawableBuilder()
+        val indicatorBackground = indicatorDrawable ?: DrawableBuilder()
             .rectangle()
             .solidColor(indicatorColor)
             .cornerRadius(DisplayUtil.dp2px(5f))
@@ -301,10 +331,43 @@ class CommonTabLayout @JvmOverloads constructor(
         if (tabType == TYPE_WRAP_CONTENT) {
             tab?.customView?.let {
                 val customViewBinding = LayoutCommonTabItemBinding.bind(it)
-                customViewBinding.tabTitle.setPadding(tabPaddingHorizontal, tabPaddingVertical, tabPaddingHorizontal, tabPaddingVertical)
-                name?.let { text ->
-                    customViewBinding.tabTitle.text = text
-                    customViewBinding.vLine.background = indicatorBackground
+                customViewBinding.tabTitle.setPadding(
+                    tabPaddingHorizontal,
+                    tabPaddingVertical,
+                    tabPaddingHorizontal,
+                    tabPaddingVertical
+                )
+                when (indicatorWidthMode) {
+                    INDICATOR_WIDTH_MATCH_PARENT -> {
+                        customViewBinding.vLine.updateLayoutParams<LayoutParams> {
+                            width = 0
+                            height = indicatorHeight.toInt()
+                            startToStart = LayoutParams.PARENT_ID
+                            endToEnd = LayoutParams.PARENT_ID
+                        }
+                    }
+
+                    INDICATOR_WIDTH_WRAP_TEXT -> {
+                        customViewBinding.vLine.updateLayoutParams<LayoutParams> {
+                            width = 0
+                            height = indicatorHeight.toInt()
+                            startToStart = customViewBinding.tabTitle.id
+                            endToEnd = customViewBinding.tabTitle.id
+                        }
+                    }
+
+                    INDICATOR_WIDTH_FIXED -> {
+                        customViewBinding.vLine.updateLayoutParams<LayoutParams> {
+                            width = indicatorWidth?.toInt() ?: 10.dp()
+                            height = indicatorHeight.toInt()
+                            startToStart = LayoutParams.PARENT_ID
+                            endToEnd = LayoutParams.PARENT_ID
+                        }
+                    }
+                }
+                customViewBinding.vLine.background = indicatorBackground
+                name?.let {
+                    customViewBinding.tabTitle.text = name
                 }
                 if (isSelected) {
                     customViewBinding.tabTitle.background = selectedTabBg
@@ -315,9 +378,9 @@ class CommonTabLayout @JvmOverloads constructor(
                     customViewBinding.tabTitle.setTextColor(selectedTabColor)
                     customViewBinding.tabTitle.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
                     if (showIndicator) {
-                        customViewBinding.vLine.visibility = View.VISIBLE
+                        customViewBinding.vLine.visibility = VISIBLE
                     } else {
-                        customViewBinding.vLine.visibility = View.GONE
+                        customViewBinding.vLine.visibility = GONE
                     }
                 } else {
                     customViewBinding.tabTitle.background = normalTabBg
@@ -327,16 +390,49 @@ class CommonTabLayout @JvmOverloads constructor(
                     )
                     customViewBinding.tabTitle.setTextColor(normalTabColor)
                     customViewBinding.tabTitle.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
-                    customViewBinding.vLine.visibility = View.GONE
+                    customViewBinding.vLine.visibility = GONE
                 }
             }
         } else {
             tab?.customView?.let {
                 val customViewBinding = LayoutCommonTabItemMatchParentBinding.bind(it)
-                customViewBinding.tabTitle.setPadding(tabPaddingHorizontal, tabPaddingVertical, tabPaddingHorizontal, tabPaddingVertical)
-                name?.let { text ->
-                    customViewBinding.tabTitle.text = text
-                    customViewBinding.vLine.background = indicatorBackground
+                customViewBinding.tabTitle.setPadding(
+                    tabPaddingHorizontal,
+                    tabPaddingVertical,
+                    tabPaddingHorizontal,
+                    tabPaddingVertical
+                )
+                when (indicatorWidthMode) {
+                    INDICATOR_WIDTH_MATCH_PARENT -> {
+                        customViewBinding.vLine.updateLayoutParams<LayoutParams> {
+                            width = 0
+                            height = indicatorHeight.toInt()
+                            startToStart = LayoutParams.PARENT_ID
+                            endToEnd = LayoutParams.PARENT_ID
+                        }
+                    }
+
+                    INDICATOR_WIDTH_WRAP_TEXT -> {
+                        customViewBinding.vLine.updateLayoutParams<LayoutParams> {
+                            width = 0
+                            height = indicatorHeight.toInt()
+                            startToStart = customViewBinding.tabTitle.id
+                            endToEnd = customViewBinding.tabTitle.id
+                        }
+                    }
+
+                    INDICATOR_WIDTH_FIXED -> {
+                        customViewBinding.vLine.updateLayoutParams<LayoutParams> {
+                            width = indicatorWidth?.toInt() ?: 10.dp()
+                            height = indicatorHeight.toInt()
+                            startToStart = LayoutParams.PARENT_ID
+                            endToEnd = LayoutParams.PARENT_ID
+                        }
+                    }
+                }
+                customViewBinding.vLine.background = indicatorBackground
+                name?.let {
+                    customViewBinding.tabTitle.text = name
                 }
                 if (isSelected) {
                     customViewBinding.tabTitle.background = selectedTabBg
@@ -347,15 +443,15 @@ class CommonTabLayout @JvmOverloads constructor(
                         selectedTabTextSize
                     )
                     if (showIndicator) {
-                        customViewBinding.vLine.visibility = View.VISIBLE
+                        customViewBinding.vLine.visibility = VISIBLE
                     } else {
-                        customViewBinding.vLine.visibility = View.GONE
+                        customViewBinding.vLine.visibility = GONE
                     }
                 } else {
                     customViewBinding.tabTitle.background = normalTabBg
                     customViewBinding.tabTitle.setTextColor(normalTabColor)
                     customViewBinding.tabTitle.typeface = Typeface.defaultFromStyle(Typeface.NORMAL)
-                    customViewBinding.vLine.visibility = View.GONE
+                    customViewBinding.vLine.visibility = GONE
                     customViewBinding.tabTitle.setTextSize(
                         TypedValue.COMPLEX_UNIT_PX,
                         normalTabTextSize

app/src/main/res/layout/layout_common_tab_item.xml

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
-    android:layout_height="45dp">
+    android:layout_height="match_parent"
+    tools:layout_height="45dp">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tab_title"
@@ -24,13 +25,12 @@
 
     <View
         android:id="@+id/v_line"
-        android:layout_width="10dp"
-        android:layout_height="3dp"
-        android:layout_marginTop="4dp"
+        android:layout_width="0dp"
+        android:layout_height="2dp"
         android:visibility="gone"
-        tools:visibility="visible"
-        tools:background="@drawable/commonui_tab_line_green_bg"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tab_title" />
+        tools:background="@drawable/commonui_tab_line_green_bg"
+        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/layout_common_tab_item_match_parent.xml

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="45dp">
+    android:layout_height="match_parent"
+    tools:layout_height="48dp">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tab_title"
@@ -22,11 +23,10 @@
 
     <View
         android:id="@+id/v_line"
-        android:layout_width="12dp"
-        android:layout_height="3dp"
-        android:layout_marginTop="4dp"
-        tools:background="@drawable/commonui_tab_line_green_bg"
+        android:layout_width="0dp"
+        android:layout_height="2dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tab_title" />
+        tools:background="@drawable/commonui_tab_line_green_bg" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/attrs.xml

@@ -100,6 +100,14 @@
         <attr name="normal_text_size" />
         <attr name="selected_text_size" />
         <attr name="indicator_color" format="color" />
+        <attr name="indicator_drawable" format="reference" />
+        <attr name="indicator_width_mode" format="enum" >
+            <enum name="match_parent" value="0" />
+            <enum name="wrap_text" value="1" />
+            <enum name="fixed" value="2" />
+        </attr>
+        <attr name="indicator_width" format="dimension" />
+        <attr name="indicator_height" format="dimension" />
         <attr name="normal_tab_color" format="color" />
         <attr name="normal_tab_bg" format="reference" />
         <attr name="selected_tab_color" format="color" />

module/im/src/main/java/com/adealink/weparty/im/session/OfficialSessionActivity.kt

@@ -5,8 +5,8 @@ import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.router.Router
 import com.adealink.frame.router.annotation.BindExtra
 import com.adealink.frame.router.annotation.RouterUri
-import com.adealink.frame.util.DisplayUtil.getStatusBarHeight
 import com.adealink.frame.util.onClick
+import com.adealink.frame.util.statusBarHeight
 import com.adealink.weparty.commonui.BaseActivity
 import com.adealink.weparty.commonui.ext.dp
 import com.adealink.weparty.im.databinding.ActivityOfficialSessionBinding
@@ -53,7 +53,7 @@ class OfficialSessionActivity : BaseActivity() {
         setContentView(binding.root)
         binding.topBar.root.setPadding(
             0,
-            getStatusBarHeight(this@OfficialSessionActivity) + 5.dp(),
+            this@OfficialSessionActivity.statusBarHeight() + 5.dp(),
             0,
             5.dp()
         )

module/im/src/main/java/com/adealink/weparty/im/session/SessionActivity.kt

@@ -6,7 +6,7 @@ import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.router.Router
 import com.adealink.frame.router.annotation.BindExtra
 import com.adealink.frame.router.annotation.RouterUri
-import com.adealink.frame.util.DisplayUtil.getStatusBarHeight
+import com.adealink.frame.util.statusBarHeight
 import com.adealink.weparty.commonui.BaseActivity
 import com.adealink.weparty.commonui.ext.dp
 import com.adealink.weparty.im.databinding.ActivitySessionBinding
@@ -54,7 +54,7 @@ class SessionActivity : BaseActivity() {
         setContentView(binding.root)
         binding.topBar.root.setPadding(
             0,
-            getStatusBarHeight(this@SessionActivity) + 5.dp(),
+            this@SessionActivity.statusBarHeight() + 5.dp(),
             0,
             5.dp()
         )

module/playmate/src/main/java/com/adealink/weparty/playmate/detail/comp/PlaymateToolBarViewComp.kt

@@ -14,9 +14,9 @@ import com.adealink.frame.log.Log
 import com.adealink.frame.mvvm.view.ViewComponent
 import com.adealink.frame.mvvm.viewmodel.activityViewModels
 import com.adealink.frame.router.Router
-import com.adealink.frame.util.DisplayUtil
 import com.adealink.frame.util.isActivityInValid
 import com.adealink.frame.util.onClick
+import com.adealink.frame.util.statusBarHeight
 import com.adealink.weparty.commonui.dialogfragment.CommonTextActionDialog
 import com.adealink.weparty.commonui.ext.dp
 import com.adealink.weparty.commonui.ext.dpf
@@ -47,7 +47,7 @@ class PlaymateToolBarViewComp(
     @SuppressLint("UseKtx")
     private fun initView() {
         val activity = activity ?: return
-        val statusBarHeight = DisplayUtil.getStatusBarHeight(activity)
+        val statusBarHeight = activity.statusBarHeight()
         val topbarHeight =
             statusBarHeight + getCompatDimension(APP_R.dimen.common_top_bar_height).toInt()
         binding.topBarContainer.root.setPadding(16.dp(), statusBarHeight, 16.dp(), 0)

module/profile/src/main/java/com/adealink/weparty/profile/UserProfileActivity.kt

@@ -9,7 +9,7 @@ import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.router.Router
 import com.adealink.frame.router.annotation.BindExtra
 import com.adealink.frame.router.annotation.RouterUri
-import com.adealink.frame.util.DisplayUtil.getStatusBarHeight
+import com.adealink.frame.util.statusBarHeight
 import com.adealink.weparty.commonui.BaseActivity
 import com.adealink.weparty.commonui.recycleview.adapter.BaseActivityTabFragmentStateAdapter
 import com.adealink.weparty.commonui.widget.EmptyFragment
@@ -43,7 +43,7 @@ class UserProfileActivity : BaseActivity() {
         setContentView(binding.root)
         binding.profileHeaderLayout.ivBg.updateLayoutParams<ConstraintLayout.LayoutParams> {
             height =
-                getCompatDimension(R.dimen.profile_header_height).toInt() + getStatusBarHeight(this@UserProfileActivity)
+                getCompatDimension(R.dimen.profile_header_height).toInt() + this@UserProfileActivity.statusBarHeight()
         }
 
         profilePageAdapter = ProfilePageAdapter()

module/profile/src/main/java/com/adealink/weparty/profile/blacklist/BlackListActivity.kt

@@ -7,7 +7,7 @@ import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.router.Router
 import com.adealink.frame.router.annotation.BindExtra
 import com.adealink.frame.router.annotation.RouterUri
-import com.adealink.frame.util.DisplayUtil.getStatusBarHeight
+import com.adealink.frame.util.statusBarHeight
 import com.adealink.weparty.commonui.BaseActivity
 import com.adealink.weparty.module.profile.Profile
 import com.adealink.weparty.profile.R
@@ -34,7 +34,7 @@ class BlackListActivity : BaseActivity() {
         setContentView(binding.root)
         binding.topBar.updateLayoutParams<ConstraintLayout.LayoutParams> {
             height =
-                getCompatDimension(R.dimen.profile_header_height).toInt() + getStatusBarHeight(this@BlackListActivity)
+                getCompatDimension(R.dimen.profile_header_height).toInt() + this@BlackListActivity.statusBarHeight()
         }
 
     }

module/profile/src/main/java/com/adealink/weparty/profile/comp/ProfileToolBarViewComp.kt

@@ -1,19 +1,28 @@
 package com.adealink.weparty.profile.comp
 
+import android.animation.ArgbEvaluator
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.GradientDrawable
 import android.view.ViewGroup.MarginLayoutParams
+import androidx.core.graphics.toColorInt
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.LifecycleOwner
+import com.adealink.frame.aab.util.getCompatDimension
 import com.adealink.frame.log.Log
 import com.adealink.frame.mvvm.view.ViewComponent
-import com.adealink.frame.util.DisplayUtil
 import com.adealink.frame.util.isActivityInValid
+import com.adealink.frame.util.onClick
+import com.adealink.frame.util.statusBarHeight
 import com.adealink.weparty.commonui.ext.dp
+import com.adealink.weparty.commonui.ext.dpf
 import com.adealink.weparty.module.profile.ProfileModule
 import com.adealink.weparty.module.profile.data.UserInfo
 import com.adealink.weparty.profile.databinding.ActivityUserProfileBinding
 import com.google.android.material.appbar.AppBarLayout
 import com.qmuiteam.qmui.widget.util.QMUIStatusBarHelper
 import kotlin.math.abs
+import com.adealink.weparty.R as APP_R
 
 class ProfileToolBarViewComp(
     lifecycleOwner: LifecycleOwner,
@@ -21,7 +30,7 @@ class ProfileToolBarViewComp(
     private val binding: ActivityUserProfileBinding
 ) : ViewComponent(lifecycleOwner) {
 
-    companion object{
+    companion object {
         const val TAG = "ProfileToolBarViewComp"
     }
 
@@ -39,12 +48,35 @@ class ProfileToolBarViewComp(
 
     private fun initView() {
         val activity = activity ?: return
-        val statusBarHeight = DisplayUtil.getStatusBarHeight(activity)
-        binding.topBarContainer.updateLayoutParams<MarginLayoutParams> {
-            height = statusBarHeight + 44.dp()
+        val statusBarHeight = activity.statusBarHeight()
+        val topbarHeight =
+            statusBarHeight + getCompatDimension(APP_R.dimen.common_top_bar_height).toInt()
+        binding.topBarContainer.root.setPadding(16.dp(), statusBarHeight, 16.dp(), 0)
+        binding.topBarContainer.root.updateLayoutParams<MarginLayoutParams> {
+            height = topbarHeight
         }
-
-        binding.collapsingToolbarLayout.minimumHeight = statusBarHeight + 44.dp()
+        binding.collapsingToolbarLayout.minimumHeight = topbarHeight
+
+        //顶部栏背景
+        val fromColor = "#00FFFFFF".toColorInt()
+        val toColor = "#FFFFFFFF".toColorInt()
+        val topBarDrawable = ColorDrawable(fromColor)
+        binding.topBarContainer.root.background = topBarDrawable
+
+        //内容背景
+        val fromRadius = 20.dpf()
+        val toRadius = 0
+        val contentDrawable = GradientDrawable().apply {
+            shape = GradientDrawable.RECTANGLE
+            setColor(Color.WHITE)
+            cornerRadii = floatArrayOf(
+                fromRadius, fromRadius, //top-left
+                fromRadius, fromRadius, //top-right
+                0f, 0f, //bottom-left
+                0f, 0f //bottom-right
+            )
+        }
+        binding.tabLayout.background = contentDrawable
 
         binding.appBarLayout.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
             if (isActivityInValid(activity)) {
@@ -54,28 +86,31 @@ class ProfileToolBarViewComp(
             Log.d(TAG, "appBarHeight = $appBarHeight, verticalOffset = $verticalOffset")
             val percent =
                 (abs(verticalOffset) * 1f / (appBarLayout.totalScrollRange)).coerceIn(0F, 1F)
-            binding.topBarContainer.alpha = percent
 
-            //todo: 顶部栏返回按钮
-//            val fromColor = Color.WHITE  // 起始颜色：白色
-//            val toColor = Color.BLACK    // 目标颜色：黑色
-//            val color = ArgbEvaluator().evaluate(percent, fromColor, toColor) as Int
-//            val backDrawable = getCompatDrawable(R.drawable.profile_back_icon).mutate()
-//            backDrawable.setTint(color)
-//            binding.btnBack.setBackgroundDrawable(backDrawable)
-//            binding.btnEdit.background.setTint(color)
+            val color = ArgbEvaluator().evaluate(percent, fromColor, toColor) as Int
+            topBarDrawable.color = color
+
+            val radius = fromRadius + (toRadius - fromRadius) * percent
+            contentDrawable.cornerRadii = floatArrayOf(
+                radius, radius, //top-left
+                radius, radius, //top-right
+                0f, 0f, //bottom-left
+                0f, 0f //bottom-right
+            )
 
             if (percent == 1f) {
+                binding.topBarContainer.ivBack.setImageResource(APP_R.drawable.commonui_back_black_48_ic)
                 QMUIStatusBarHelper.setStatusBarLightMode(activity)
             } else {
+                binding.topBarContainer.ivBack.setImageResource(APP_R.drawable.commonui_back_white_48_ic)
                 QMUIStatusBarHelper.setStatusBarDarkMode(activity)
             }
 
         })
 
-//        binding.btnBack.onClick {
-//            activity?.finish()
-//        }
+        binding.topBarContainer.ivBack.onClick {
+            activity.finish()
+        }
 
         if (isSelf) {
 //            binding.btnEdit.setBackgroundResource(R.drawable.profile_edit_icon)

module/profile/src/main/java/com/adealink/weparty/profile/report/ReportActivity.kt

@@ -7,7 +7,7 @@ import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.router.Router
 import com.adealink.frame.router.annotation.BindExtra
 import com.adealink.frame.router.annotation.RouterUri
-import com.adealink.frame.util.DisplayUtil.getStatusBarHeight
+import com.adealink.frame.util.statusBarHeight
 import com.adealink.weparty.commonui.BaseActivity
 import com.adealink.weparty.module.profile.Profile
 import com.adealink.weparty.profile.R
@@ -34,7 +34,7 @@ class ReportActivity : BaseActivity() {
         setContentView(binding.root)
         binding.topBar.updateLayoutParams<ConstraintLayout.LayoutParams> {
             height =
-                getCompatDimension(R.dimen.profile_header_height).toInt() + getStatusBarHeight(this@ReportActivity)
+                getCompatDimension(R.dimen.profile_header_height).toInt() + this@ReportActivity.statusBarHeight()
         }
 
     }

module/profile/src/main/res/drawable-xhdpi/profile_header_cover_bg.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:centerColor="@color/color_80000000"
+        android:endColor="@color/color_00000000"
+        android:startColor="@color/color_000000" />
+</shape>

module/profile/src/main/res/drawable-xhdpi/profile_indicator.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="0"
+        android:endColor="#B1EF5D"
+        android:startColor="#4ED2FF"
+        android:type="linear" />
+
+    <corners android:radius="100dp" />
+</shape>

module/profile/src/main/res/layout/activity_user_profile.xml

@@ -38,16 +38,20 @@
         <com.adealink.weparty.commonui.widget.CommonTabLayout
             android:id="@+id/tabLayout"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:background="@drawable/profile_tab_bg"
+            android:layout_height="50dp"
             app:indicator_color="@color/color_222222"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:normal_tab_color="@color/color_999999"
-            app:normal_text_size="16sp"
+            app:normal_text_size="14sp"
+            app:indicator_drawable="@drawable/profile_indicator"
+            app:indicator_width_mode="match_parent"
             app:selected_tab_color="@color/color_222222"
-            app:selected_text_size="16sp" />
+            app:selected_text_size="14sp"
+            app:tab_mode="fixed"
+            app:tab_type="match_parent"
+            tools:background="@drawable/profile_tab_bg" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -57,27 +61,12 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <include
         android:id="@+id/topBarContainer"
+        layout="@layout/layout_user_profile_topbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_title"
-            android:layout_width="match_parent"
-            android:layout_height="44dp"
-            android:layout_marginHorizontal="44dp"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:textColor="@color/color_222222"
-            android:textSize="18sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            tools:text="HelloWorld" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
+        android:layout_height="@dimen/common_top_bar_height"
+        android:paddingHorizontal="16dp" />
 
     <include
         android:id="@+id/v_bottom"

module/profile/src/main/res/layout/layout_user_profile_header.xml

@@ -13,6 +13,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/profile_header_cover_bg"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="375:142"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <!--基础信息 -->
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_user_info"

module/profile/src/main/res/layout/layout_user_profile_topbar.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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="@dimen/common_top_bar_height"
+    android:paddingHorizontal="16dp">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_back"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/commonui_back_white_48_ic" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="1"
+        android:textColor="@color/color_222222"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="HelloWorld" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

module/share/src/main/java/com/adealink/weparty/share/poster/SharePosterActivity.kt

@@ -8,7 +8,7 @@ import com.adealink.frame.aab.util.getCompatDimension
 import com.adealink.frame.base.fastLazy
 import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.router.annotation.RouterUri
-import com.adealink.frame.util.DisplayUtil.getStatusBarHeight
+import com.adealink.frame.util.statusBarHeight
 import com.adealink.weparty.commonui.BaseActivity
 import com.adealink.weparty.commonui.ext.dpf
 import com.adealink.weparty.commonui.recycleview.adapter.MultiTypeListAdapter
@@ -35,11 +35,11 @@ class SharePosterActivity : BaseActivity(), PhotoItemViewBinder.OnPhotoSelectedL
         super.initViews()
         setContentView(binding.root)
         binding.topBar.setPadding(
-            0, getStatusBarHeight(this@SharePosterActivity), 0, 0
+            0, this@SharePosterActivity.statusBarHeight(), 0, 0
         )
         binding.topBar.updateLayoutParams<ConstraintLayout.LayoutParams> {
             height =
-                getStatusBarHeight(this@SharePosterActivity) + getCompatDimension(APP_R.dimen.common_top_bar_height).toInt()
+                this@SharePosterActivity.statusBarHeight() + getCompatDimension(APP_R.dimen.common_top_bar_height).toInt()
         }
 
         listAdapter.register(PhotoItemViewBinder(this))