From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app/src/main/res/layout/activity_family_memorabilia_create.xml | 51 ++++++++++++++++-----------------------------------
1 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/app/src/main/res/layout/item_family_create.xml b/app/src/main/res/layout/activity_family_memorabilia_create.xml
similarity index 84%
rename from app/src/main/res/layout/item_family_create.xml
rename to app/src/main/res/layout/activity_family_memorabilia_create.xml
index e43ff34..16cc68c 100644
--- a/app/src/main/res/layout/item_family_create.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia_create.xml
@@ -13,6 +13,7 @@
tools:context=".ui.function.CreateFamilyProjectActivity"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/color_normal_background"
android:orientation="vertical">
<com.hjq.bar.TitleBar
@@ -44,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:background="@drawable/ic_operate"
+ android:background="@{viewModel.typeLiveData?@drawable/ic_operate_finish:@drawable/ic_operate}"
/>
</FrameLayout>
@@ -95,7 +96,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="璇疯緭鍏ユ爣棰�"
- android:inputType="number"
+ android:inputType="text"
android:autofillHints="creditCardNumber"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
@@ -119,7 +120,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:hint="璇疯緭鍏ユ椂闂�"
- android:inputType="number"
+ android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:text="@={viewModel.beanMutableLiveData.createTime}"
@@ -141,7 +142,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:hint="璇疯緭鍏ヤ汉鐗�"
- android:inputType="number"
+ android:inputType="text"
android:textColorHint="#6b000000"
android:text="@={viewModel.beanMutableLiveData.people}"
android:textColor="#DE000000"
@@ -163,7 +164,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:hint="璇疯緭鍏ュ湴鐐�"
- android:inputType="number"
+ android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:text="@={viewModel.beanMutableLiveData.address}"
@@ -185,7 +186,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
android:hint="璇疯緭鍏ュ娉�"
- android:inputType="number"
+ android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
android:text="@={viewModel.beanMutableLiveData.remark}"
@@ -199,39 +200,19 @@
android:textColor="#ff000000"
android:textSize="@dimen/sp_12"
/>
- <LinearLayout
+ <com.android.app_base.widget.WrapRecyclerView
+ android:id="@+id/rv_image"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_180"
- android:layout_marginTop="@dimen/dp_2"
+ android:layout_height="wrap_content"
android:background="@drawable/shape_6b0000_stroke"
- android:layout_marginBottom="10dp"
- >
+ android:layout_marginBottom="20dp"
+ android:layout_marginTop="@dimen/dp_2"
+ android:paddingStart="10dp"
+ android:paddingEnd="5dp"
+ android:paddingVertical="10dp"
+ />
- <Button
- android:id="@+id/button_add"
- android:layout_width="@dimen/dp_85"
- android:layout_height="@dimen/dp_85"
- android:text="+"
- android:textColor="@color/black"
- android:textSize="@dimen/dp_35"
- android:gravity="center"
- android:layout_marginLeft="@dimen/dp_10"
- android:layout_marginTop="@dimen/dp_10"
- android:background="@drawable/shape_73fab4cd_solid"
- />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="瀵煎叆"
- android:textColorHint="#6b000000"
- android:textColor="#DE000000"
- android:textSize="@dimen/sp_12"
- android:layout_marginLeft="@dimen/dp_40"
- />
-
- </LinearLayout>
</LinearLayout>
</ScrollView>
--
Gitblit v1.9.1