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/item_growth_experience_holder_condition.xml | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/app/src/main/res/layout/item_growth_experience_holder_condition.xml b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
index 0f5fb56..8af7f84 100644
--- a/app/src/main/res/layout/item_growth_experience_holder_condition.xml
+++ b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
@@ -15,7 +15,7 @@
<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="match_parent"
- android:layout_height="40dp"
+ android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
app:cardBackgroundColor="@color/color_card_pink"
@@ -31,15 +31,6 @@
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="wrap_content"
android:layout_height="wrap_content"
@@ -47,7 +38,6 @@
android:layout_marginStart="24dp"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
- android:text="@{bean.passCheck}"
android:layout_weight="1"
android:textStyle="bold"
/>
@@ -56,7 +46,6 @@
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
- android:text="@{bean.duringTime}"
android:textStyle="bold"
android:layout_marginEnd="24dp"
android:layout_alignParentEnd="true"
@@ -109,7 +98,6 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@{bean.idNumber}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
--
Gitblit v1.9.1