feat: UI fix

app/src/main/java/com/adealink/weparty/commonui/Constants.kt

@@ -29,10 +29,11 @@ val DEFAULT_FONT_BOLD: Typeface
 
 fun commonSelectedDrawable(
     radii: Float = 12.dpf(),
-    borderWidth: Float = 1.dpf()
+    borderWidth: Float = 1.dpf(),
+    solidColor: Int? = null
 ): GradientBorderDrawable {
-    return GradientBorderBuilder()
-        .setRadii(
+    return GradientBorderBuilder().apply {
+        setRadii(
             floatArrayOf(
                 radii,
                 radii,
@@ -44,8 +45,11 @@ fun commonSelectedDrawable(
                 radii
             )
         )
-        .setBorderWidth(borderWidth)
-        .setBorderAngle(315)
-        .setBorderColors(intArrayOf("#4ED2FF".toColorInt(), "#B1EF5D".toColorInt()))
-        .build()
+        setBorderWidth(borderWidth)
+        setBorderAngle(315)
+        setBorderColors(intArrayOf("#4ED2FF".toColorInt(), "#B1EF5D".toColorInt()))
+        solidColor?.let {
+            setBgColor(solidColor)
+        }
+    }.build()
 }

app/src/main/java/com/adealink/weparty/module/playmate/widget/PriceView.kt

@@ -11,6 +11,7 @@ import androidx.core.view.updateLayoutParams
 import com.adealink.weparty.R
 import com.adealink.weparty.commonui.DEFAULT_FONT_BOLD
 import com.adealink.weparty.commonui.DEFAULT_FONT_REGULAR
+import com.adealink.weparty.commonui.widget.util.getColorX
 import com.adealink.weparty.databinding.LayoutPriceViewBinding
 import com.adealink.weparty.util.formatNumberStr
 
@@ -29,7 +30,9 @@ class PriceView @JvmOverloads constructor(
     private var iconSize = 12
     private var priceTextSize = 12
     private var priceTextBold = true
+    private var priceTextColor = getColorX(R.color.price_text_color)
     private var unitTextSize = 12
+    private var unitTextColor = getColorX(R.color.price_unit_text_color)
     private var priceTextGravity = TEXT_GRAVITY_CENTER
 
     init {
@@ -58,10 +61,19 @@ class PriceView @JvmOverloads constructor(
                 R.styleable.PriceView_price_text_bold,
                 priceTextBold
             )
+            priceTextColor = getColor(
+                R.styleable.PriceView_price_text_color,
+                priceTextColor
+            )
+
             unitTextSize = getDimensionPixelSize(
                 R.styleable.PriceView_unit_text_size,
                 12
             )
+            unitTextColor = getColor(
+                R.styleable.PriceView_unit_text_color,
+                unitTextColor
+            )
             priceTextGravity = getInt(
                 R.styleable.PriceView_price_text_gravity,
                 TEXT_GRAVITY_CENTER
@@ -90,7 +102,9 @@ class PriceView @JvmOverloads constructor(
             binding.tvPrice.typeface = DEFAULT_FONT_REGULAR
         }
         binding.tvPrice.setTextSize(TypedValue.COMPLEX_UNIT_PX, priceTextSize.toFloat())
+        binding.tvPrice.setTextColor(priceTextColor)
         binding.tvUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX, unitTextSize.toFloat())
+        binding.tvUnit.setTextColor(unitTextColor)
     }
 
     fun setPrice(price: Float, unit: String?) {

module/profile/src/main/res/drawable/profile_bottom_layout_bg.xml → app/src/main/res/drawable/common_bottom_white_mask_bg.xml

@@ -1,12 +1,10 @@
 <?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/white"
+        android:centerColor="@color/color_FFFFFF"
         android:endColor="@color/color_00FFFFFF"
-        android:startColor="@color/white"
+        android:startColor="@color/color_FFFFFF"
         android:type="linear" />
-
 </shape>

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

@@ -118,7 +118,7 @@
                 android:layout_width="0dp"
                 android:layout_height="36dp"
                 android:layout_marginHorizontal="50dp"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="16dp"
                 android:visibility="gone"
                 app:button_radius="22dp"
                 app:common_button_type="cancel"

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

@@ -25,7 +25,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:includeFontPadding="false"
-        android:textColor="@color/color_FF0D0D0D"
+        android:textColor="@color/price_text_color"
         android:textSize="28sp"
         app:fontFamily="@font/poppins_semibold"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -40,7 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="1dp"
         android:includeFontPadding="false"
-        android:textColor="@color/color_FF8E8E8E"
+        android:textColor="@color/price_unit_text_color"
         android:textSize="12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tv_price"
         app:layout_constraintEnd_toEndOf="parent"

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

@@ -613,7 +613,9 @@
         <attr name="price_icon_size" format="dimension" />
         <attr name="price_text_size" format="dimension" />
         <attr name="price_text_bold" format="boolean" />
+        <attr name="price_text_color" format="color" />
         <attr name="unit_text_size" format="dimension" />
+        <attr name="unit_text_color" format="color" />
         <attr name="price_text_gravity">
             <enum name="center" value="0" />
             <enum name="bottom" value="1" />

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

@@ -34,6 +34,9 @@
     <color name="roulette_inner_border">#66FFFFFF</color>
     <color name="roulette_outer_border">#FFFFFFFF</color>
 
+    <color name="price_text_color">@color/color_FF0D0D0D</color>
+    <color name="price_unit_text_color">@color/color_FF8E8E8E</color>
+
     <color name="data_binding_span_at_somebody">#ff00dfd6</color>
     <color name="water_behind_color_default">#FF0091C8</color>
     <color name="water_front_color_default">#FF00F9FF</color>

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

@@ -106,7 +106,7 @@ class SessionFragment : BaseFragment(R.layout.fragment_session) {
         binding.rvMessage.setAdapter(sessionAdapter)
         sessionAdapter.setOnItemClickListener(onMessageItemClickListener)
         sessionAdapter.setOnPlaymateOrderClickListener(onOrderMessageItemClick)
-        binding.rvMessage.addItemDecoration(VerticalSpaceItemDecoration(8.dp(), 24.dp(), 20.dp()))
+        binding.rvMessage.addItemDecoration(VerticalSpaceItemDecoration(10.dp(), 24.dp(), 10.dp()))
         binding.rvMessage.setOnGestureScrollListener(object : OnGestureScrollListener {
             override fun onScroll(
                 m1: MotionEvent?,

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

@@ -181,6 +181,12 @@ class SessionBottomInputComp(
                 } else {
                     isTextSendEnable = true
                 }
+                if (inputBar.etInputMessage.lineCount > 1) {
+                    //大于一行
+                    inputBar.clInput.setBackgroundResource(R.drawable.im_session_input_multi_line_bg)
+                } else {
+                    inputBar.clInput.setBackgroundResource(R.drawable.im_session_input_bg)
+                }
             }
         })
     }

module/im/src/main/res/drawable/im_session_input_multi_line_bg.xml

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

module/im/src/main/res/layout/fragment_session.xml

@@ -22,7 +22,6 @@
         android:id="@+id/rv_message"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="10dp"
         app:layout_constraintBottom_toTopOf="@id/bottom_bar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

module/im/src/main/res/layout/layout_session_bottom_input_bar.xml

@@ -36,11 +36,12 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="6dp"
-            android:paddingVertical="8dp"
             android:background="@null"
             android:gravity="start|center_vertical"
             android:hint="@string/im_session_input_message"
             android:includeFontPadding="false"
+            android:maxLines="4"
+            android:paddingVertical="8dp"
             android:textColor="@color/color_FF1D2129"
             android:textColorHint="@color/color_FFC9CDD4"
             android:textSize="14sp"

module/im/src/main/res/layout/view_session_skill_top_bar.xml

@@ -54,13 +54,14 @@
             android:id="@+id/v_playmate_price"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="2dp"
             app:layout_constraintBottom_toBottomOf="@id/iv_playmate_category"
             app:layout_constraintStart_toStartOf="@id/tv_playmate_category_name"
             app:layout_constraintTop_toBottomOf="@id/tv_playmate_category_name"
             app:price_icon_size="14.4dp"
             app:price_text_bold="false"
             app:price_text_size="14sp"
+            app:unit_text_color="@color/price_text_color"
             app:unit_text_size="14sp" />
 
         <androidx.constraintlayout.widget.Barrier

module/joinus/src/main/res/layout/activity_join_us.xml

@@ -30,6 +30,7 @@
         layout="@layout/layout_join_us_progress"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
         android:layout_marginTop="8dp"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
@@ -41,7 +42,7 @@
         android:id="@+id/fl_content"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="10dp"
         android:background="@drawable/common_bottom_dialog_bg"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"

module/order/src/main/java/com/adealink/weparty/order/PlaymateOrderListActivity.kt

@@ -76,7 +76,7 @@ class PlaymateOrderListActivity : BaseActivity(),
         binding.rvOrder.addItemDecoration(
             VerticalSpaceItemDecoration(
                 10.dp(),
-                firstSpaceHeight = 12.dp()
+                firstSpaceHeight = 10.dp()
             )
         )
     }

module/order/src/main/java/com/adealink/weparty/order/UserOrderListActivity.kt

@@ -76,8 +76,8 @@ class UserOrderListActivity : BaseActivity(), UserOrderListItemViewBinder.OrderL
         binding.rvOrder.adapter = listAdapter
         binding.rvOrder.addItemDecoration(
             VerticalSpaceItemDecoration(
-                20.dp(),
-                firstSpaceHeight = 16.dp()
+                10.dp(),
+                firstSpaceHeight = 10.dp()
             )
         )
     }

module/order/src/main/java/com/adealink/weparty/order/detail/OrderDetailActivity.kt

@@ -182,7 +182,7 @@ class OrderDetailActivity : BaseActivity() {
 
         binding.tvProductTypeDetail.text = data?.order?.categoryName
         binding.tvProductPriceDetail.text = data?.order?.price?.toString()
-        binding.tvOrderCountDetail.text = "${data?.order?.purchaseQty} x ${data?.order?.unit}"
+        binding.tvOrderCountDetail.text = "${data?.order?.unit} x${data?.order?.purchaseQty}"
         if (data?.order?.customerRemark.isNullOrEmpty()) {
             binding.clOrderRemark.gone()
         } else {

module/order/src/main/res/layout/layout_user_order_list_item.xml

@@ -86,6 +86,7 @@
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toEndOf="@id/iv_avatar"
             app:layout_constraintTop_toTopOf="@id/iv_avatar"
+            app:layout_constraintVertical_bias="1"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="Super Beautiful Girl Super Beautiful Girl Super Beautiful Girl" />
 
@@ -113,7 +114,8 @@
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="@id/iv_avatar"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/iv_avatar">
+            app:layout_constraintTop_toTopOf="@id/iv_avatar"
+            app:layout_constraintVertical_bias="1">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:layout_width="12.8dp"
@@ -146,7 +148,7 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tv_price"
-                tools:text="x1" />
+                tools:text="hour x1" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

module/playmate/src/main/java/com/adealink/weparty/playmate/findpartner/comp/FindPartnerOptionsComp.kt

@@ -37,8 +37,8 @@ class FindPartnerOptionsComp(
         binding.rvOptions.adapter = optionAdapter
         binding.rvOptions.layoutManager = FlowLayoutManager(
             FlowLayoutManager.VERTICAL,
-            8.dp(),
-            10.dp()
+            6.dp(),
+            8.dp()
         )
         optionAdapter.register(OptionItemViewBinder(object :
             OptionItemViewBinder.OnOptionsSelectListener {

module/playmate/src/main/res/drawable/find_partner_form_divider.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <size android:height="20dp" />
+    <size android:height="12dp" />
 </shape>

module/playmate/src/main/res/layout/layout_playmate_activity_home_list_top.xml

@@ -1,7 +1,6 @@
 <?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="wrap_content">
 
@@ -54,7 +53,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:ellipsize="end"
-            android:fontFamily="@font/poppins_semibold"
             android:gravity="start|center_vertical"
             android:lines="2"
             android:text="@string/common_more"

module/playmate/src/main/res/layout/layout_playmate_detail_bottom.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/common_bottom_white_mask_bg"
     android:paddingHorizontal="16dp"
     android:paddingTop="16dp"
     tools:paddingBottom="36dp">

module/profile/src/main/java/com/adealink/weparty/profile/ui/about/SKillViewBinding.kt

@@ -10,6 +10,8 @@ import com.adealink.weparty.commonui.recycleview.adapter.BindingViewHolder
 import com.adealink.weparty.commonui.recycleview.adapter.multitype.ItemViewBinder
 import com.adealink.weparty.module.profile.data.UserPlaymateSkill
 import com.adealink.weparty.profile.databinding.LayoutProfileSkillItemBinding
+import com.adealink.weparty.util.formatNumber
+import com.adealink.weparty.util.formatNumberStr
 
 data class SkillItemData(
     val data: UserPlaymateSkill
@@ -36,7 +38,7 @@ class SKillViewBinder(
         holder.binding.ivBg.setImageUrl(item.data.cover)
         holder.binding.ivIcon.setImageUrl(item.data.icon)
         holder.binding.tvTitle.text = item.data.name
-        holder.binding.tvDesc.text = "${item.data.price}/${item.data.unit}"
+        holder.binding.tvDesc.text = "${formatNumberStr(item.data.price, omitted = false)}/${item.data.unit}"
         holder.binding.root.onClick {
             order.invoke(item.data)
         }

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/profile_bottom_layout_bg"
+    android:background="@drawable/common_bottom_white_mask_bg"
     android:paddingTop="16dp"
     android:paddingBottom="36dp">
 
@@ -17,7 +17,7 @@
         android:visibility="gone"
         app:button_left_drawable="@drawable/profile_follow_ic"
         app:button_left_drawable_margin="4dp"
-        app:button_left_drawable_width="16dp"
+        app:button_left_drawable_width="22dp"
         app:common_button_type="normal1"
         app:layout_constraintEnd_toStartOf="@id/btn_chat"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -25,6 +25,7 @@
         android:singleLine="true"
         android:textColor="@color/color_FF1D2129"
         android:textSize="14sp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@id/tv_id"
         app:layout_constraintEnd_toStartOf="@id/v_gender"
         app:layout_constraintHorizontal_bias="0"
@@ -32,13 +33,13 @@
         app:layout_constraintStart_toEndOf="@id/iv_avatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="UserNameUserName" />
+        tools:text="UserNameUserNameUserNameUserName" />
 
     <com.adealink.weparty.module.profile.widget.GenderView
         android:id="@+id/v_gender"
         style="@style/CommonGenderView"
         android:layout_marginStart="4dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginEnd="24dp"
         app:layout_constraintBottom_toBottomOf="@id/tv_name"
         app:layout_constraintEnd_toStartOf="@id/barrier_right"
         app:layout_constraintStart_toEndOf="@id/tv_name"

module/share/src/main/java/com/adealink/weparty/share/qrcode/page/common/CommonQRCodeFragment.kt

@@ -1,9 +1,12 @@
 package com.adealink.weparty.share.qrcode.page.common
 
+import android.graphics.Color
 import com.adealink.frame.base.Rlt
 import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.util.copyToClipBoard
 import com.adealink.frame.util.onClick
+import com.adealink.weparty.commonui.commonSelectedDrawable
+import com.adealink.weparty.commonui.ext.dpf
 import com.adealink.weparty.commonui.toast.util.showFailedToast
 import com.adealink.weparty.commonui.toast.util.showToast
 import com.adealink.weparty.module.playmate.data.UserPlaymateCategoryData
@@ -39,6 +42,7 @@ class CommonQRCodeFragment : BaseQRCodeFragment(R.layout.fragment_common_qr_code
 
     override fun initViews() {
         super.initViews()
+        binding.btnSaveImage.background = commonSelectedDrawable(24.dpf(), solidColor = Color.WHITE)
         binding.btnSaveImage.onClick {
             checkStoragePermissionAndSaveQRCode()
         }

module/share/src/main/java/com/adealink/weparty/share/qrcode/page/special/SpecialQRCodeStep2Fragment.kt

@@ -1,9 +1,12 @@
 package com.adealink.weparty.share.qrcode.page.special
 
+import android.graphics.Color
 import com.adealink.frame.base.Rlt
 import com.adealink.frame.mvvm.view.viewBinding
 import com.adealink.frame.util.copyToClipBoard
 import com.adealink.frame.util.onClick
+import com.adealink.weparty.commonui.commonSelectedDrawable
+import com.adealink.weparty.commonui.ext.dpf
 import com.adealink.weparty.commonui.toast.util.showFailedToast
 import com.adealink.weparty.commonui.toast.util.showToast
 import com.adealink.weparty.share.R
@@ -28,6 +31,7 @@ class SpecialQRCodeStep2Fragment : BaseQRCodeFragment(R.layout.fragment_common_q
 
     override fun initViews() {
         super.initViews()
+        binding.btnSaveImage.background = commonSelectedDrawable(24.dpf(), solidColor = Color.WHITE)
         binding.btnSaveImage.onClick {
             checkStoragePermissionAndSaveQRCode()
         }

module/share/src/main/res/drawable/share_qr_code_save_img_bg.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="24dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/color_FF4E5969" />
-</shape>

module/share/src/main/res/layout/fragment_common_qr_code.xml

@@ -34,8 +34,10 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/iv_qr_code"
             app:price_icon_size="19dp"
+            app:price_text_color="@color/color_FF1D2129"
             app:price_text_gravity="bottom"
             app:price_text_size="24sp"
+            app:unit_text_color="@color/color_FF1D2129"
             app:unit_text_size="14sp" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -51,12 +53,11 @@
         android:id="@+id/btn_save_image"
         android:layout_width="0dp"
         android:layout_height="48dp"
-        android:background="@drawable/share_qr_code_save_img_bg"
         android:fontFamily="@font/poppins_semibold"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/share_save_image"
-        android:textColor="@color/color_FF4E5969"
+        android:textColor="@color/color_FF3FBFBD"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="@id/btn_copy_link"
         app:layout_constraintEnd_toStartOf="@id/btn_copy_link"

module/share/src/main/res/layout/fragment_special_qr_code_step_2.xml

@@ -50,12 +50,11 @@
         android:id="@+id/btn_save_image"
         android:layout_width="0dp"
         android:layout_height="48dp"
-        android:background="@drawable/share_qr_code_save_img_bg"
         android:fontFamily="@font/poppins_semibold"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/share_save_image"
-        android:textColor="@color/color_FF4E5969"
+        android:textColor="@color/color_FF3FBFBD"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="@id/btn_copy_link"
         app:layout_constraintEnd_toStartOf="@id/btn_copy_link"