From c0a15189766e557a3a6e7d5bad06eae23152b098 Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 28 三月 2023 21:23:56 +0800
Subject: [PATCH] 拉取代码

---
 app/src/main/res/layout/item_family_memorabilia.xml |   14 --------------
 app/src/main/AndroidManifest.xml                    |    3 +++
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cf9de1b..01b5a38 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,9 @@
         <activity
             android:name=".ui.function.FamilyMemorabiliaActivity"
             android:exported="false" />
+        <activity
+            android:name=".ui.function.CreateFamilyProjectActivity"
+            android:exported="false" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_family_memorabilia.xml b/app/src/main/res/layout/item_family_memorabilia.xml
index dd14e4e..97e678c 100644
--- a/app/src/main/res/layout/item_family_memorabilia.xml
+++ b/app/src/main/res/layout/item_family_memorabilia.xml
@@ -282,19 +282,5 @@
         </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