From a1d1fb7c44e33c4baeb52964a027932018bc1325 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期二, 04 四月 2023 16:35:39 +0800
Subject: [PATCH] 家大事记添加接口、家庭资产、家庭设备
---
app/src/main/res/layout/item_family_memorabilia.xml | 145 +++++++++++------------------------------------
1 files changed, 35 insertions(+), 110 deletions(-)
diff --git a/app/src/main/res/layout/item_family_memorabilia.xml b/app/src/main/res/layout/item_family_memorabilia.xml
index dd14e4e..0a3b18f 100644
--- a/app/src/main/res/layout/item_family_memorabilia.xml
+++ b/app/src/main/res/layout/item_family_memorabilia.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
@@ -11,13 +12,11 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
>
-
<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_40"
+ android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
app:cardBackgroundColor="@color/color_card_pink"
@@ -26,39 +25,51 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingHorizontal="@dimen/dp_24"
>
- <LinearLayout
+ <RelativeLayout
android:id="@+id/layout_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
android:gravity="center_vertical"
>
+ <CheckBox
+ android:id="@+id/checkbox"
+ android:layout_width="18dp"
+ android:layout_height="18dp"
+ android:layout_marginStart="3dp"
+ android:layout_centerVertical="true"
+ android:button="@drawable/selector_checkbox"
+ android:background="?selectableItemBackgroundBorderless"
+ />
<TextView
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="24dp"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
- android:text="寮犳皬app绔嬮」"
+ android:text="@{bean.title}"
android:layout_weight="1"
android:textStyle="bold"
/>
<TextView
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
- android:text="2023.3.1"
+ android:text="@{bean.createTime}"
android:textStyle="bold"
- android:gravity="end"
+ android:layout_marginEnd="24dp"
+ android:layout_alignParentEnd="true"
+ android:layout_centerVertical="true"
/>
- </LinearLayout>
+ </RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:paddingHorizontal="@dimen/dp_24"
>
<LinearLayout
android:layout_width="match_parent"
@@ -77,7 +88,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="01"
+ android:text="@{String.valueOf(bean.id)}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
@@ -100,7 +111,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="寮犱笁銆佹潕鍥涖�佸紶鍥涖�佹潕涓�"
+ android:text="@{bean.people}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
@@ -123,7 +134,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="椤圭洰绔嬮」"
+ android:text="@{bean.remark}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
@@ -144,86 +155,13 @@
android:orientation="horizontal"
android:layout_marginBottom="@dimen/dp_15"
>
-
- <LinearLayout
- android:layout_width="wrap_content"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_image"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center"
- >
- <ImageView
- android:layout_width="@dimen/dp_70"
- android:layout_height="@dimen/dp_45"
- android:background="@drawable/img_sakura"
- android:layout_marginBottom="@dimen/dp_6"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="sakura.jpg"
- android:textSize="@dimen/sp_10"
- android:textColor="@color/black"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center"
- android:layout_marginStart="@dimen/dp_10"
- >
- <ImageView
- android:layout_width="@dimen/dp_70"
- android:layout_height="@dimen/dp_45"
- android:background="@drawable/img_lotus"
- android:layout_marginBottom="@dimen/dp_6"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="lotus.jpg"
- android:textSize="@dimen/sp_10"
- android:textColor="@color/black"
- />
- </LinearLayout>
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center"
- android:layout_marginStart="@dimen/dp_10"
- >
- <androidx.cardview.widget.CardView
- android:layout_width="@dimen/dp_70"
- android:layout_height="@dimen/dp_45"
- android:layout_marginBottom="@dimen/dp_6"
- app:cardCornerRadius="@dimen/dp_5"
- >
- <ImageView
- android:layout_width="@dimen/dp_70"
- android:layout_height="@dimen/dp_45"
- android:background="@drawable/img_sakura"
- />
- <View
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="#52000000"
- />
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_play"
- android:layout_gravity="center"
- />
- </androidx.cardview.widget.CardView>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="sakura.mp4"
- android:textSize="@dimen/sp_10"
- android:textColor="@color/black"
- />
- </LinearLayout>
+ tools:listitem="@layout/item_image"
+ tools:itemCount="3"
+ />
</LinearLayout>
<LinearLayout
@@ -233,6 +171,7 @@
android:layout_marginBottom="@dimen/dp_12"
>
<LinearLayout
+ android:id="@+id/layout_modify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
@@ -253,6 +192,7 @@
/>
</LinearLayout>
<LinearLayout
+ android:id="@+id/layout_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@@ -282,19 +222,4 @@
</androidx.cardview.widget.CardView>
</LinearLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- >
- <LinearLayout
- android:layout_width="@dimen/dp_56"
- android:layout_height="@dimen/dp_56"
- android:orientation="vertical"
-
- >
-
- </LinearLayout>
- </LinearLayout>
-
</layout>
\ No newline at end of file
--
Gitblit v1.9.1