From e808338698915f51ff128e8861d7d580ae1a84b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 五月 2024 16:24:20 +0800
Subject: [PATCH] Merge branch 'wjc_new' into wxw_new
---
app/src/main/res/layout/item_house_line_c.xml | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/app/src/main/res/layout/item_house_line_c.xml b/app/src/main/res/layout/item_house_line_c.xml
index d65f728..5b91cab 100644
--- a/app/src/main/res/layout/item_house_line_c.xml
+++ b/app/src/main/res/layout/item_house_line_c.xml
@@ -8,28 +8,53 @@
<TextView
android:id="@+id/house_name_tv"
- android:layout_width="300dp"
+ android:layout_width="0dp"
android:layout_height="@dimen/dp_19"
android:layout_marginStart="@dimen/dp_16"
+ android:layout_marginEnd="@dimen/dp_16"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/power_station"
- android:textColor="@color/text_90000000"
+ android:textColor="@color/text_E6000000"
android:textSize="@dimen/text_16"
app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/house_Image_ll"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <ImageView
- android:id="@+id/house_move_iv"
- android:layout_width="@dimen/dp_40"
- android:layout_height="@dimen/dp_40"
- android:layout_marginEnd="@dimen/dp_21"
- android:src="@drawable/move_c_house"
- android:visibility="gone"
+ <LinearLayout
+ android:id="@+id/house_Image_ll"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent">
+
+ <ImageView
+ android:id="@+id/house_del_iv"
+ android:layout_width="@dimen/dp_40"
+ android:layout_height="@dimen/dp_40"
+ android:layout_marginEnd="@dimen/dp_16"
+ android:src="@drawable/del_home"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/house_move_iv"
+ android:layout_width="@dimen/dp_40"
+ android:layout_height="@dimen/dp_40"
+ android:layout_marginEnd="@dimen/dp_21"
+ android:src="@drawable/move_c_house"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/house_select_iv"
+ android:layout_width="@dimen/dp_40"
+ android:layout_height="@dimen/dp_40"
+ android:layout_marginEnd="@dimen/dp_21"
+ android:visibility="gone" />
+ </LinearLayout>
<View
android:layout_width="match_parent"
@@ -37,7 +62,6 @@
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="0.5dp"
- android:background="@color/text_EDEFF2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
--
Gitblit v1.8.0