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/activity_test_log.xml | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/layout/activity_test_log.xml b/app/src/main/res/layout/activity_test_log.xml
index 3a0b898..a592164 100644
--- a/app/src/main/res/layout/activity_test_log.xml
+++ b/app/src/main/res/layout/activity_test_log.xml
@@ -84,10 +84,10 @@
android:id="@+id/homeId_tv"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
+ android:layout_marginStart="4dp"
android:textColor="@color/text_030D1C"
android:textIsSelectable="true"
android:textSize="@dimen/text_15"
- android:layout_marginStart="@dimen/dp_5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -100,6 +100,19 @@
android:textSize="@dimen/text_15"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/homeId_tv" />
+
+
+ <TextView
+ android:id="@+id/click_to_bottom_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/dp_25"
+ android:layout_marginEnd="20dp"
+ android:text="婊氬埌搴曢儴"
+ android:textColor="@color/text_245EC3"
+ android:textSize="@dimen/text_15"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
@@ -116,7 +129,6 @@
android:id="@+id/sv"
android:layout_width="0dp"
android:layout_height="0dp"
- android:layout_marginBottom="@dimen/dp_50"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -128,7 +140,7 @@
<TextView
android:id="@+id/reply_content_tv"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:padding="@dimen/dp_10"
@@ -143,12 +155,12 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
+ android:background="@color/text_FFFFFFFF"
+ android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/sv"
- android:background="@color/text_FFFFFFFF"
- >
+ app:layout_constraintTop_toBottomOf="@+id/sv">
<TextView
android:id="@+id/uploading_log_tv"
--
Gitblit v1.8.0