Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0'

feat: ui修改

See merge request app_android_lib/YDL-Component!92

m-confide/src/main/java/com/ydl/confide/home/ConfideBottomSheetDialogFragment.kt

@@ -3,6 +3,8 @@ package com.ydl.confide.home
 import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -246,19 +248,21 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
             behavior?.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
                 override fun onStateChanged(bottomSheet: View, newState: Int) {
                     when (newState) {
-                        3 -> {
+                        BottomSheetBehavior.STATE_EXPANDED -> {
+                            bottomSheet.background = ColorDrawable(Color.WHITE)
                             rl_title.visibility = View.VISIBLE
                             close_webview_Icon.visibility = View.VISIBLE
                             text_title.visibility = View.VISIBLE
                             line.visibility = View.GONE
                         }
-                        1 -> {
+                        BottomSheetBehavior.STATE_DRAGGING -> {
+                            bottomSheet.setBackgroundResource(R.drawable.confide_bottom_webview)
                             rl_title.visibility = View.VISIBLE
                             close_webview_Icon.visibility = View.GONE
                             text_title.visibility = View.GONE
                             line.visibility = View.VISIBLE
                         }
-                        4 -> {
+                        BottomSheetBehavior.STATE_COLLAPSED -> {
                             rl_title.visibility = View.VISIBLE
                             line.visibility = View.VISIBLE
                         }

m-confide/src/main/res/drawable/confide_bg_color_666666.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:bottomRightRadius="6dp"/>
-    <solid android:color="#B3BBC1CD" />
+    <solid android:color="#4d000000" />
 </shape>
\ No newline at end of file

m-confide/src/main/res/drawable/confide_bg_color_ff8f38.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:bottomRightRadius="6dp"/>
-    <solid android:color="#CCFF994B"/>
+    <solid android:color="#4d000000"/>
 </shape>
\ No newline at end of file

m-confide/src/main/res/drawable/confide_bg_main_color.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:bottomRightRadius="6dp"/>
-    <solid android:color="#701da1f2" />
+    <solid android:color="#4d000000" />
 
 </shape>
\ No newline at end of file

m-confide/src/main/res/layout/confide_recommend_view_new.xml

@@ -79,7 +79,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/platform_sp_14"
-                android:textColor="#ACADB1"
+                android:textColor="#555555"
                 android:textStyle="bold"
                 tools:text="83%"
                 />
@@ -89,7 +89,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/platform_sp_12"
-                android:textColor="#BCBCBC"
+                android:textColor="#69696A"
                 android:text="接通率" />
         </LinearLayout>
         <LinearLayout
@@ -104,7 +104,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/platform_sp_14"
-                android:textColor="#ACADB1"
+                android:textColor="#555555"
                 android:textStyle="bold"
                 android:layout_marginTop="12dp"
                 tools:text="8000人"
@@ -115,7 +115,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/platform_sp_12"
-                android:textColor="#BCBCBC"
+                android:textColor="#69696A"
                 android:text="倾诉人次"
                  />
         </LinearLayout>
@@ -131,7 +131,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/platform_sp_14"
-                android:textColor="#ACADB1"
+                android:textColor="#555555"
                 android:textStyle="bold"
                 android:layout_marginTop="12dp"
                 tools:text="4.9"
@@ -142,7 +142,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/platform_sp_12"
-                android:textColor="#BCBCBC"
+                android:textColor="#69696A"
                 android:text="评分"
                 />
         </LinearLayout>