From 15cd434674051e5d29215b47862686c773625fd4 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 28 四月 2023 23:20:02 +0800
Subject: [PATCH] 代码提交
---
app/src/main/res/layout/item_family_memorabilia.xml | 127 ++++++-----------------------------------
1 files changed, 20 insertions(+), 107 deletions(-)
diff --git a/app/src/main/res/layout/item_family_memorabilia.xml b/app/src/main/res/layout/item_family_memorabilia.xml
index 6628019..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
@@ -11,9 +12,7 @@
<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"
@@ -21,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"
@@ -51,7 +51,6 @@
android:textColor="@color/black"
android:text="@{bean.title}"
android:layout_weight="1"
- android:textStyle="bold"
/>
<TextView
android:layout_width="wrap_content"
@@ -59,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"
@@ -84,7 +82,7 @@
android:text="搴忓彿锛�"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
<TextView
android:layout_width="wrap_content"
@@ -92,7 +90,7 @@
android:text="@{String.valueOf(bean.id)}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
</LinearLayout>
<LinearLayout
@@ -107,7 +105,7 @@
android:text="浜虹墿锛�"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
<TextView
android:layout_width="wrap_content"
@@ -115,7 +113,7 @@
android:text="@{bean.people}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
</LinearLayout>
<LinearLayout
@@ -130,7 +128,7 @@
android:text="澶囨敞锛�"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
<TextView
android:layout_width="wrap_content"
@@ -138,7 +136,7 @@
android:text="@{bean.remark}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
</LinearLayout>
<TextView
@@ -148,7 +146,7 @@
android:text="鐢靛瓙鏂囦欢锛�"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
- android:textStyle="bold"
+
/>
<LinearLayout
android:layout_width="match_parent"
@@ -156,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
@@ -245,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"
>
@@ -260,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"
@@ -282,7 +209,7 @@
android:text="鍒犻櫎"
android:textColor="#FFE86F72"
android:textSize="@dimen/sp_14"
- android:textStyle="bold"
+
android:layout_marginStart="@dimen/dp_4"
/>
</LinearLayout>
@@ -293,20 +220,6 @@
</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