From e193e93c74d59b8894aa511e0616406d5b180350 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Thu, 14 May 2026 20:24:46 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=9B=BF=E6=8D=A2=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=B1=95=E5=BC=80/=E6=94=B6=E8=B5=B7=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E5=B9=B6=E5=BE=AE=E8=B0=83=20padding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 ic_new_expand 替换为线条更简洁的 ic_new_expand_1， 同时把按钮内边距从 4dp 调整为 2dp，让图标在 36dp 容器内更舒展。 Co-Authored-By: Claude Opus 4.6 --- .../src/main/res/drawable/ic_new_expand.xml | 11 --------- .../src/main/res/drawable/ic_new_expand_1.xml | 24 +++++++++++++++++++ .../res/layout/activity_int_exp_arrive.xml | 4 ++-- .../layout/activity_int_exp_storage_use.xml | 4 ++-- .../res/layout/activity_int_exp_tally.xml | 4 ++-- .../layout/activity_int_arr_air_manifest.xml | 4 ++-- .../res/layout/activity_int_imp_manifest.xml | 4 ++-- .../layout/activity_int_imp_storage_use.xml | 4 ++-- 8 files changed, 36 insertions(+), 23 deletions(-) delete mode 100644 module_base/src/main/res/drawable/ic_new_expand.xml create mode 100644 module_base/src/main/res/drawable/ic_new_expand_1.xml diff --git a/module_base/src/main/res/drawable/ic_new_expand.xml b/module_base/src/main/res/drawable/ic_new_expand.xml deleted file mode 100644 index a2ddaa7..0000000 --- a/module_base/src/main/res/drawable/ic_new_expand.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/module_base/src/main/res/drawable/ic_new_expand_1.xml b/module_base/src/main/res/drawable/ic_new_expand_1.xml new file mode 100644 index 0000000..45ae23b --- /dev/null +++ b/module_base/src/main/res/drawable/ic_new_expand_1.xml @@ -0,0 +1,24 @@ + + + + diff --git a/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml b/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml index 3ae38c2..058b67c 100644 --- a/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml +++ b/module_gjc/src/main/res/layout/activity_int_exp_arrive.xml @@ -101,9 +101,9 @@ android:layout_height="36dp" android:layout_marginStart="16dp" android:onClick="@{()-> viewModel.toggleAllExpand()}" - android:padding="4dp" + android:padding="2dp" android:scaleType="fitCenter" - loadImage="@{viewModel.isAllExpanded ? R.drawable.ic_new_expand : R.drawable.ic_new_expand}" + loadImage="@{viewModel.isAllExpanded ? R.drawable.ic_new_expand_1 : R.drawable.ic_new_expand_1}" android:contentDescription="展开/收起全部子列表" /> diff --git a/module_gjc/src/main/res/layout/activity_int_exp_storage_use.xml b/module_gjc/src/main/res/layout/activity_int_exp_storage_use.xml index 97e99ca..f6dbbda 100644 --- a/module_gjc/src/main/res/layout/activity_int_exp_storage_use.xml +++ b/module_gjc/src/main/res/layout/activity_int_exp_storage_use.xml @@ -108,13 +108,13 @@ diff --git a/module_gjc/src/main/res/layout/activity_int_exp_tally.xml b/module_gjc/src/main/res/layout/activity_int_exp_tally.xml index 0e4d065..1d2cc57 100644 --- a/module_gjc/src/main/res/layout/activity_int_exp_tally.xml +++ b/module_gjc/src/main/res/layout/activity_int_exp_tally.xml @@ -102,9 +102,9 @@ android:layout_height="36dp" android:layout_marginStart="16dp" android:onClick="@{()-> viewModel.toggleAllExpand()}" - android:padding="4dp" + android:padding="2dp" android:scaleType="fitCenter" - loadImage="@{viewModel.isAllExpanded ? R.drawable.ic_new_expand : R.drawable.ic_new_expand}" + loadImage="@{viewModel.isAllExpanded ? R.drawable.ic_new_expand_1 : R.drawable.ic_new_expand_1}" android:contentDescription="展开/收起全部子列表" /> diff --git a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml index 5cbcc79..61489c0 100644 --- a/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml +++ b/module_gjj/src/main/res/layout/activity_int_arr_air_manifest.xml @@ -99,8 +99,8 @@ android:layout_height="36dp" android:layout_marginStart="16dp" android:onClick="@{()-> viewModel.toggleAllExpand()}" - android:padding="4dp" - android:src="@drawable/ic_new_expand" /> + android:padding="2dp" + android:src="@drawable/ic_new_expand_1" /> diff --git a/module_gjj/src/main/res/layout/activity_int_imp_manifest.xml b/module_gjj/src/main/res/layout/activity_int_imp_manifest.xml index 9b952d1..90f7f66 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_manifest.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_manifest.xml @@ -130,8 +130,8 @@ android:layout_height="36dp" android:layout_marginStart="16dp" android:onClick="@{()-> viewModel.toggleAllExpand()}" - android:padding="4dp" - android:src="@drawable/ic_new_expand" /> + android:padding="2dp" + android:src="@drawable/ic_new_expand_1" /> diff --git a/module_gjj/src/main/res/layout/activity_int_imp_storage_use.xml b/module_gjj/src/main/res/layout/activity_int_imp_storage_use.xml index 3d99312..7549718 100644 --- a/module_gjj/src/main/res/layout/activity_int_imp_storage_use.xml +++ b/module_gjj/src/main/res/layout/activity_int_imp_storage_use.xml @@ -108,13 +108,13 @@