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_static_list.xml | 56 ++++++++++++++++++++++----------------------------------
1 files changed, 22 insertions(+), 34 deletions(-)
diff --git a/app/src/main/res/layout/dialog_static_list.xml b/app/src/main/res/layout/dialog_static_list.xml
index 78720b1..140e028 100644
--- a/app/src/main/res/layout/dialog_static_list.xml
+++ b/app/src/main/res/layout/dialog_static_list.xml
@@ -1,43 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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="@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">
+ android:layout_height="wrap_content"
+ android:background="@color/text_FF222222"
+ android:orientation="vertical">
<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">
+ android:orientation="horizontal">
<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" />
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14" />
</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"
+ android:background="@color/text_1AFFFFFF"
/>
@@ -46,45 +36,43 @@
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">
+ android:orientation="horizontal">
<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"
+ android:textColor="@color/text_E6FFFFFF"
+ android:textSize="@dimen/text_14"
/>
</LinearLayout>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="20dp"
+ android:background="@color/text_FF000000"
+
+ />
<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">
+ android:orientation="horizontal">
<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"
+ android:textColor="@color/text_66FFFFFF"
+ android:textSize="@dimen/text_14"
/>
</LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
--
Gitblit v1.8.0