From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/res/layout/dialog_device_list_test.xml | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/app/src/main/res/layout/dialog_device_list_test.xml b/app/src/main/res/layout/dialog_device_list_test.xml
index 0235ea0..0a012b1 100644
--- a/app/src/main/res/layout/dialog_device_list_test.xml
+++ b/app/src/main/res/layout/dialog_device_list_test.xml
@@ -1,27 +1,18 @@
<?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:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:id="@+id/test_dialog_parent"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/text_FF1C1C1E">
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/test_dialog_parent"
- android:layout_width="@dimen/dp_141"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/test_logic_rcv"
+ android:layout_width="match_parent"
android:layout_height="272dp"
- android:layout_marginTop="110dp"
- android:layout_marginEnd="70dp"
- android:background="@drawable/list_464d5a"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/test_logic_rcv"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
- </androidx.constraintlayout.widget.ConstraintLayout>
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0