From a0dc6be52293a64ebfe38b8c2391dc7d2ffe63ae Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 15 五月 2023 20:05:27 +0800
Subject: [PATCH] 提交代码
---
app/src/main/res/layout/item_family_memorabilia.xml | 112 ++++++++++---------------------------------------------
1 files changed, 21 insertions(+), 91 deletions(-)
diff --git a/app/src/main/res/layout/item_family_memorabilia.xml b/app/src/main/res/layout/item_family_memorabilia.xml
index 4e6e118..be9ef3f 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
@@ -19,6 +20,7 @@
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
>
<LinearLayout
android:layout_width="match_parent"
@@ -49,7 +51,6 @@
android:textColor="@color/black"
android:text="@{bean.title}"
android:layout_weight="1"
- android:textStyle="bold"
/>
<TextView
android:layout_width="wrap_content"
@@ -57,7 +58,6 @@
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
android:text="@{bean.createTime}"
- android:textStyle="bold"
android:layout_marginEnd="24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
@@ -82,7 +82,7 @@
android:text="搴忓彿锛�"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
<TextView
android:layout_width="wrap_content"
@@ -90,7 +90,7 @@
android:text="@{String.valueOf(bean.id)}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
</LinearLayout>
<LinearLayout
@@ -105,7 +105,7 @@
android:text="浜虹墿锛�"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
<TextView
android:layout_width="wrap_content"
@@ -113,7 +113,7 @@
android:text="@{bean.people}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
</LinearLayout>
<LinearLayout
@@ -128,7 +128,7 @@
android:text="澶囨敞锛�"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
<TextView
android:layout_width="wrap_content"
@@ -136,7 +136,7 @@
android:text="@{bean.remark}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
</LinearLayout>
<TextView
@@ -146,7 +146,7 @@
android:text="鐢靛瓙鏂囦欢锛�"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
<LinearLayout
android:layout_width="match_parent"
@@ -154,86 +154,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
@@ -243,6 +170,7 @@
android:layout_marginBottom="@dimen/dp_12"
>
<LinearLayout
+ android:id="@+id/layout_modify"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
@@ -258,11 +186,12 @@
android:text="淇敼"
android:textColor="@color/black"
android:textSize="@dimen/sp_14"
- android:textStyle="bold"
+
android:layout_marginStart="@dimen/dp_4"
/>
</LinearLayout>
<LinearLayout
+ android:id="@+id/layout_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
@@ -280,7 +209,7 @@
android:text="鍒犻櫎"
android:textColor="#FFE86F72"
android:textSize="@dimen/sp_14"
- android:textStyle="bold"
+
android:layout_marginStart="@dimen/dp_4"
/>
</LinearLayout>
@@ -292,4 +221,5 @@
</androidx.cardview.widget.CardView>
</LinearLayout>
+
</layout>
\ No newline at end of file
--
Gitblit v1.9.1