From 590c1cff46b105d774271f950caa9f65523f05c1 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 29 十二月 2023 20:20:40 +0800
Subject: [PATCH] 1、增加护眼模式主题\n2、修复显示问题

---
 app/src/main/res/layout/item_contacts.xml |   94 ++++++++++++-----------------------------------
 1 files changed, 24 insertions(+), 70 deletions(-)

diff --git a/app/src/main/res/layout/item_contacts.xml b/app/src/main/res/layout/item_contacts.xml
index ed796e3..52874e5 100644
--- a/app/src/main/res/layout/item_contacts.xml
+++ b/app/src/main/res/layout/item_contacts.xml
@@ -6,7 +6,7 @@
     <data>
         <variable
             name="bean"
-            type="com.application.zhangshi_app_android.bean.FamilyContactsBean" />
+            type="com.application.zhangshi_app_android.bean.ContactsBean" />
     </data>
 
     <LinearLayout
@@ -16,10 +16,11 @@
         <androidx.cardview.widget.CardView
             android:id="@+id/cardView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/dp_2"
+            android:layout_height="40dp"
+            android:layout_margin="2dp"
+            tools:layout_height="wrap_content"
             app:cardCornerRadius="@dimen/dp_10"
-            app:cardBackgroundColor="@color/color_card_pink"
+            app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
             >
             <LinearLayout
                 android:layout_width="match_parent"
@@ -29,86 +30,39 @@
                 <RelativeLayout
                     android:id="@+id/layout_title"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_40"
-                    android:gravity="center_vertical|center_horizontal"
+                    android:layout_height="40dp"
                     >
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_gravity="center"
-                        android:textSize="@dimen/sp_16"
+                        android:layout_centerInParent="true"
+                        android:text="@{bean.myName+` 鐨� 閫� 璁� 褰昤}"
                         android:textColor="@color/black"
-                        android:gravity="center"
-                        android:textStyle="bold"
-                        tools:text="寮犱笁鐨勯�氳褰�"
+                        android:textSize="16sp"
+                        tools:text="寮犱笁 鐨� 閫� 璁� 褰�" />
+                    <ImageView
+                        android:id="@+id/iv_fold"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/ic_fold"
+                        android:layout_marginEnd="10dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
                         />
-
-
                 </RelativeLayout>
                 <LinearLayout
                     android:id="@+id/layout_content"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:paddingHorizontal="@dimen/dp_24"
+                    android:layout_marginBottom="20dp"
                     >
-                    <LinearLayout
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/recyclerView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_marginBottom="@dimen/dp_6"
-                        >
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="寮犱簩"
-                            android:textColor="@color/black"
-                            android:textSize="@dimen/sp_14"
-                            android:textStyle="bold"
-                            />
-
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_marginBottom="@dimen/dp_6"
-                        >
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text="鐖朵翰"
-                            android:textColor="#80000000"
-                            android:textSize="@dimen/sp_12"
-                            android:layout_weight="1"
-
-                            />
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text="寮犳皬鍏徃"
-                            android:textColor="#80000000"
-                            android:textSize="@dimen/sp_12"
-                            android:layout_weight="1"
-
-                            />
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:text="12345678901"
-                            android:textColor="#80000000"
-                            android:textSize="@dimen/sp_12"
-                            android:layout_weight="1"
-
-                            />
-                    </LinearLayout>
-
-
-
-
-
-
+                        android:layout_marginHorizontal="25dp"
+                        tools:listitem="@layout/item_contacts_detail"
+                        />
                 </LinearLayout>
             </LinearLayout>
 

--
Gitblit v1.9.1