From 8f5fe758de9464a5118bd306814c170b768fe695 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 09:29:14 +0800
Subject: [PATCH] Merge branch 'heads/v1.4.2'
---
app/src/main/res/layout/dialog_static_list.xml | 152 ++++++++++++++++++++++++--------------------------
1 files changed, 74 insertions(+), 78 deletions(-)
diff --git a/app/src/main/res/layout/dialog_static_list.xml b/app/src/main/res/layout/dialog_static_list.xml
index b3dc72f..78720b1 100644
--- a/app/src/main/res/layout/dialog_static_list.xml
+++ b/app/src/main/res/layout/dialog_static_list.xml
@@ -2,93 +2,89 @@
<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:layout_height="@dimen/dp_200"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginEnd="@dimen/dp_20"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent">
- <androidx.constraintlayout.widget.ConstraintLayout
+
+ <LinearLayout
+ android:id="@+id/hdl_china_ll"
android:layout_width="match_parent"
- android:layout_height="@dimen/dp_200"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginEnd="@dimen/dp_20"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_height="@dimen/dp_50"
+ android:background="@color/ffffff"
+ android:gravity="center"
+ android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent">
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent">
- <LinearLayout
- android:id="@+id/hdl_china_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_50"
- android:background="@color/ffffff"
- android:gravity="center"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ <TextView
+ android:id="@+id/hdl_china_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="HDL China"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_18" />
+ </LinearLayout>
- <TextView
- android:id="@+id/hdl_china_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="HDL China"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18" />
- </LinearLayout>
+ <View
+ android:id="@+id/line_v"
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:background="@color/text_E1E1E1"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"
- <View
- android:id="@+id/line_v"
- android:layout_width="match_parent"
- android:layout_height="0.5dp"
- android:background="@color/text_E1E1E1"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"
+ />
+
+
+ <LinearLayout
+ android:id="@+id/hdl_bahrain_ll"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_50"
+ android:background="@color/ffffff"
+ android:gravity="center"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/line_v">
+
+ <TextView
+ android:id="@+id/hdl_bahrain_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="HDL Bahrain"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_18"
/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/hdl_cancel_ll"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_50"
+ android:layout_marginTop="@dimen/dp_20"
+ android:background="@color/ffffff"
+ android:gravity="center"
+ android:orientation="horizontal"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">
- <LinearLayout
- android:id="@+id/hdl_bahrain_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_50"
- android:background="@color/ffffff"
- android:gravity="center"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/line_v">
+ <TextView
+ android:id="@+id/hdl_cancel_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/loading_cancel"
+ android:textColor="@color/text_E6000000"
+ android:textSize="@dimen/text_18"
- <TextView
- android:id="@+id/hdl_bahrain_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="HDL Bahrain"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18"
+ />
+ </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
- />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/hdl_cancel_ll"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_50"
- android:layout_marginTop="@dimen/dp_20"
- android:background="@color/ffffff"
- android:gravity="center"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">
-
- <TextView
- android:id="@+id/hdl_cancel_tv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/loading_cancel"
- android:textColor="@color/text_E6000000"
- android:textSize="@dimen/text_18"
-
- />
- </LinearLayout>
- </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
--
Gitblit v1.8.0