From f278edbd3f0f809e4a3b59bf16d24c624a43f98d Mon Sep 17 00:00:00 2001
From: 张钢 <floatgang@163.com>
Date: 星期四, 12 九月 2024 14:38:08 +0800
Subject: [PATCH] 修改了国籍和民族字段反转的问题
---
app/src/main/res/layout/pop_operate.xml | 117 +++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 78 insertions(+), 39 deletions(-)
diff --git a/app/src/main/res/layout/pop_operate.xml b/app/src/main/res/layout/pop_operate.xml
index dc64b5a..eda3e8f 100644
--- a/app/src/main/res/layout/pop_operate.xml
+++ b/app/src/main/res/layout/pop_operate.xml
@@ -4,61 +4,76 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
<LinearLayout
android:layout_width="85dp"
- android:layout_height="122dp"
+ android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
>
- <TextView
- android:id="@+id/tv_add"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:text="鏂板缓"
- android:textColor="#FF333333"
- android:textSize="12sp"
- app:drawableStartCompat="@drawable/ic_operate_add"
- android:drawablePadding="5dp"
- android:layout_weight="1"
- />
- <View
+ <LinearLayout
+ android:id="@+id/layout_add"
android:layout_width="match_parent"
- android:layout_height="0.3dp"
- android:background="#FF939393"
- />
- <TextView
- android:id="@+id/tv_select"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="閫夋嫨"
- android:gravity="center"
- android:textColor="#FF333333"
- android:textSize="12sp"
- app:drawableStartCompat="@drawable/ic_operate_select"
- android:drawablePadding="5dp"
- android:layout_weight="1"
- />
- <View
+ android:orientation="vertical"
+ android:gravity="center_horizontal"
+ >
+ <TextView
+ android:id="@+id/tv_add"
+ android:layout_width="wrap_content"
+ android:layout_height="32dp"
+ android:gravity="center"
+ android:text="鏂板缓"
+ android:textColor="#FF333333"
+ android:textSize="12sp"
+ app:drawableStartCompat="@drawable/ic_operate_add"
+ android:drawablePadding="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_select"
android:layout_width="match_parent"
- android:layout_height="0.3dp"
- android:background="#FF939393"
- />
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center_horizontal"
+ >
+ <TextView
+ android:id="@+id/tv_select"
+ android:layout_width="wrap_content"
+ android:layout_height="32dp"
+ android:text="閫夋嫨"
+ android:gravity="center"
+ android:textColor="#FF333333"
+ android:textSize="12sp"
+ app:drawableStartCompat="@drawable/ic_operate_select"
+ android:drawablePadding="5dp"
+ />
+ <View
+ android:id="@+id/view_select_underline"
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393"
+ />
+ </LinearLayout>
+
<TextView
android:id="@+id/tv_from_new_to_old"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="32dp"
android:text="鐢辨柊鍒版棫"
android:gravity="center"
android:textColor="#FF333333"
android:textSize="12sp"
app:drawableStartCompat="@drawable/ic_operate_order"
- android:drawablePadding="5dp"
- android:layout_weight="1"
+ android:drawablePadding="3dp"
/>
<View
android:layout_width="match_parent"
@@ -68,15 +83,39 @@
<TextView
android:id="@+id/tv_from_old_to_new"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="32dp"
android:text="鐢辨棫鍒版柊"
android:gravity="center"
android:textColor="#FF333333"
android:textSize="12sp"
app:drawableStartCompat="@drawable/ic_operate_order"
- android:drawablePadding="5dp"
- android:layout_weight="1"
+ android:drawablePadding="3dp"
/>
+ <LinearLayout
+ android:id="@+id/layout_own_top"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center_horizontal"
+ >
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393"
+ />
+ <TextView
+ android:id="@+id/tv_own_top"
+ android:layout_width="wrap_content"
+ android:layout_height="32dp"
+ android:text="鏈缃《"
+ android:gravity="center"
+ android:textColor="#FF333333"
+ android:textSize="12sp"
+ app:drawableStartCompat="@drawable/ic_operate_order"
+ android:drawablePadding="3dp"
+ />
+ </LinearLayout>
+
</LinearLayout>
</androidx.cardview.widget.CardView>
\ No newline at end of file
--
Gitblit v1.9.1