From dc8ae12444d1d887394eb525e2b80dd120dc4c87 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 20 二月 2024 13:43:56 +0800
Subject: [PATCH] Merge branch 'wjc' into dev-hxb
---
app/src/main/res/layout/fragment_message.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index 1bca954..8e346f6 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -43,7 +43,7 @@
app:layout_constraintTop_toTopOf="parent" />
<View
- android:id="@+id/line2_v"
+ android:id="@+id/line1_v"
android:layout_width="0dp"
android:layout_height="3dp"
android:layout_marginTop="@dimen/dp_11"
@@ -75,7 +75,7 @@
app:layout_constraintTop_toTopOf="parent" />
<View
- android:id="@+id/line3_v"
+ android:id="@+id/line2_v"
android:layout_width="0dp"
android:layout_height="3dp"
android:layout_marginTop="@dimen/dp_11"
@@ -86,12 +86,13 @@
</androidx.constraintlayout.widget.ConstraintLayout>
- <!--鍏ㄩ儴-->
+ <!--鍏ㄩ儴 2023骞�12鏈�29鏃�09:49:59闃垮粬瑕佹眰鍏堥殣钘�-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/message_tab_all_cl"
android:layout_width="0dp"
android:layout_height="match_parent"
- android:layout_weight="1">
+ android:layout_weight="1"
+ android:visibility="gone">
<TextView
android:id="@+id/message_tab_all_title_tv"
@@ -107,7 +108,7 @@
app:layout_constraintTop_toTopOf="parent" />
<View
- android:id="@+id/line1_v"
+ android:id="@+id/line3_v"
android:layout_width="0dp"
android:layout_height="3dp"
android:layout_marginTop="@dimen/dp_11"
--
Gitblit v1.8.0