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/set_line.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/res/layout/set_line.xml b/app/src/main/res/layout/set_line.xml
index a974cf6..6aba884 100644
--- a/app/src/main/res/layout/set_line.xml
+++ b/app/src/main/res/layout/set_line.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/parent_cl"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -8,11 +9,10 @@
android:id="@+id/sll_ll_name_rl"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_57"
+ android:background="@color/text_FFFFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- android:background="@color/text_FFFFFFFF"
- >
+ app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/sll_ll_rl_name_tv"
--
Gitblit v1.8.0