Skip to content

Commit 40ec2b0

Browse files
mjsoftkingmjsoftking
committed
新增内边距统一设定
1 parent fde4daa commit 40ec2b0

9 files changed

Lines changed: 167 additions & 122 deletions

File tree

‎DialogFragmentUtilsLib/src/main/res/layout/dialog_utils_lib_custom_view.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
android:layout_width="match_parent"
4545
android:layout_height="wrap_content"
4646
android:gravity="center"
47-
android:padding="10dp"
47+
android:padding="@dimen/dialog_utils_lib_custom_title_padding"
4848
android:text="@{title}"
4949
android:textColor="@color/dialog_utils_lib_custom_title_fg"
5050
android:textSize="@dimen/dialog_utils_lib_custom_title_text_size" />
@@ -59,7 +59,7 @@
5959
android:id="@+id/contentGroup"
6060
android:layout_width="match_parent"
6161
android:layout_height="wrap_content"
62-
android:padding="10dp" />
62+
android:padding="@dimen/dialog_utils_lib_custom_content_padding" />
6363

6464
<View
6565
android:layout_width="match_parent"
@@ -81,7 +81,7 @@
8181
android:background="@{noShowCancel ? @drawable/dialog_utils_lib_custom_ok_button_double : @drawable/dialog_utils_lib_custom_ok_button}"
8282
android:gravity="center"
8383
android:onClick="@{click::onClick}"
84-
android:padding="10dp"
84+
android:padding="@dimen/dialog_utils_lib_custom_button_padding"
8585
android:text="@{okDesc}"
8686
android:textColor="@color/dialog_utils_lib_custom_ok_fg"
8787
android:textSize="@dimen/dialog_utils_lib_custom_ok_text_size"
@@ -101,7 +101,7 @@
101101
android:background="@{noShowOk ? @drawable/dialog_utils_lib_custom_cancel_button_double : @drawable/dialog_utils_lib_custom_cancel_button}"
102102
android:gravity="center"
103103
android:onClick="@{click::onClick}"
104-
android:padding="10dp"
104+
android:padding="@dimen/dialog_utils_lib_custom_button_padding"
105105
android:text="@{cancelDesc}"
106106
android:textColor="@color/dialog_utils_lib_custom_cancel_fg"
107107
android:textSize="@dimen/dialog_utils_lib_custom_cancel_text_size"
@@ -123,7 +123,7 @@
123123
android:background="@{noShowOk ? @drawable/dialog_utils_lib_custom_cancel_button_double : @drawable/dialog_utils_lib_custom_cancel_button2}"
124124
android:gravity="center"
125125
android:onClick="@{click::onClick}"
126-
android:padding="10dp"
126+
android:padding="@dimen/dialog_utils_lib_custom_button_padding"
127127
android:text="@{cancelDesc}"
128128
android:textColor="@color/dialog_utils_lib_custom_cancel_fg"
129129
android:textSize="@dimen/dialog_utils_lib_custom_cancel_text_size"
@@ -143,7 +143,7 @@
143143
android:background="@{noShowCancel ? @drawable/dialog_utils_lib_custom_ok_button_double : @drawable/dialog_utils_lib_custom_ok_button2}"
144144
android:gravity="center"
145145
android:onClick="@{click::onClick}"
146-
android:padding="10dp"
146+
android:padding="@dimen/dialog_utils_lib_custom_button_padding"
147147
android:text="@{okDesc}"
148148
android:textColor="@color/dialog_utils_lib_custom_ok_fg"
149149
android:textSize="@dimen/dialog_utils_lib_custom_ok_text_size"

‎DialogFragmentUtilsLib/src/main/res/layout/dialog_utils_lib_tip.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
android:layout_width="match_parent"
4545
android:layout_height="wrap_content"
4646
android:gravity="center"
47-
android:padding="10dp"
47+
android:padding="@dimen/dialog_utils_lib_common_title_padding"
4848
android:text="@{title}"
4949
android:textColor="@color/dialog_utils_lib_common_title_fg"
5050
android:textSize="@dimen/dialog_utils_lib_common_title_text_size" />
@@ -62,7 +62,7 @@
6262
android:focusable="true"
6363
android:gravity="center"
6464
android:maxHeight="350dp"
65-
android:padding="10dp"
65+
android:padding="@dimen/dialog_utils_lib_common_content_padding"
6666
android:scrollbars="vertical"
6767
android:textColor="@color/dialog_utils_lib_common_content_fg"
6868
android:textSize="@dimen/dialog_utils_lib_common_content_text_size" />
@@ -87,7 +87,7 @@
8787
android:background="@{noShowCancel ? @drawable/dialog_utils_lib_common_ok_button_double : @drawable/dialog_utils_lib_common_ok_button}"
8888
android:gravity="center"
8989
android:onClick="@{click::onClick}"
90-
android:padding="10dp"
90+
android:padding="@dimen/dialog_utils_lib_common_button_padding"
9191
android:text="@{okDesc}"
9292
android:textColor="@color/dialog_utils_lib_common_ok_fg"
9393
android:textSize="@dimen/dialog_utils_lib_common_ok_text_size"
@@ -107,7 +107,7 @@
107107
android:background="@{noShowOk ? @drawable/dialog_utils_lib_common_cancel_button_double : @drawable/dialog_utils_lib_common_cancel_button}"
108108
android:gravity="center"
109109
android:onClick="@{click::onClick}"
110-
android:padding="10dp"
110+
android:padding="@dimen/dialog_utils_lib_common_button_padding"
111111
android:text="@{cancelDesc}"
112112
android:textColor="@color/dialog_utils_lib_common_cancel_fg"
113113
android:textSize="@dimen/dialog_utils_lib_common_cancel_text_size"
@@ -129,7 +129,7 @@
129129
android:background="@{noShowOk ? @drawable/dialog_utils_lib_common_cancel_button_double : @drawable/dialog_utils_lib_common_cancel_button2}"
130130
android:gravity="center"
131131
android:onClick="@{click::onClick}"
132-
android:padding="10dp"
132+
android:padding="@dimen/dialog_utils_lib_common_button_padding"
133133
android:text="@{cancelDesc}"
134134
android:textColor="@color/dialog_utils_lib_common_cancel_fg"
135135
android:textSize="@dimen/dialog_utils_lib_common_cancel_text_size"
@@ -149,7 +149,7 @@
149149
android:background="@{noShowCancel ? @drawable/dialog_utils_lib_common_ok_button_double : @drawable/dialog_utils_lib_common_ok_button2}"
150150
android:gravity="center"
151151
android:onClick="@{click::onClick}"
152-
android:padding="10dp"
152+
android:padding="@dimen/dialog_utils_lib_common_button_padding"
153153
android:text="@{okDesc}"
154154
android:textColor="@color/dialog_utils_lib_common_ok_fg"
155155
android:textSize="@dimen/dialog_utils_lib_common_ok_text_size"

‎DialogFragmentUtilsLib/src/main/res/layout/dialog_utils_lib_tip_input.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
android:layout_width="match_parent"
4949
android:layout_height="wrap_content"
5050
android:gravity="center"
51-
android:padding="10dp"
51+
android:padding="@dimen/dialog_utils_lib_input_title_padding"
5252
android:text="@{title}"
5353
android:textColor="@color/dialog_utils_lib_input_title_fg"
5454
android:textSize="@dimen/dialog_utils_lib_input_title_text_size" />
@@ -67,7 +67,7 @@
6767

6868
<View
6969
android:layout_width="40dp"
70-
android:layout_height="19dp"
70+
android:layout_height="match_parent"
7171
android:layout_marginStart="5dp"
7272
android:layout_marginLeft="5dp"
7373
android:layout_marginEnd="5dp"
@@ -80,6 +80,7 @@
8080
android:layout_width="match_parent"
8181
android:layout_height="wrap_content"
8282
android:layout_weight="4"
83+
android:padding="@dimen/dialog_utils_lib_input_content_padding"
8384
android:background="@null"
8485
android:focusableInTouchMode="true"
8586
android:gravity="center"
@@ -92,7 +93,7 @@
9293
<ImageView
9394
android:id="@+id/lookPassword"
9495
android:layout_width="40dp"
95-
android:layout_height="19dp"
96+
android:layout_height="match_parent"
9697
android:layout_gravity="center_vertical"
9798
android:layout_marginStart="5dp"
9899
android:layout_marginLeft="5dp"
@@ -125,7 +126,7 @@
125126
android:background="@drawable/dialog_utils_lib_input_ok_button"
126127
android:gravity="center"
127128
android:onClick="@{click::onClick}"
128-
android:padding="10dp"
129+
android:padding="@dimen/dialog_utils_lib_input_button_padding"
129130
android:text="@{okDesc}"
130131
android:textColor="@color/dialog_utils_lib_input_ok_fg"
131132
android:textSize="@dimen/dialog_utils_lib_input_ok_text_size" />
@@ -143,7 +144,7 @@
143144
android:background="@drawable/dialog_utils_lib_input_cancel_button"
144145
android:gravity="center"
145146
android:onClick="@{click::onClick}"
146-
android:padding="10dp"
147+
android:padding="@dimen/dialog_utils_lib_input_button_padding"
147148
android:text="@{cancelDesc}"
148149
android:textColor="@color/dialog_utils_lib_input_cancel_fg"
149150
android:textSize="@dimen/dialog_utils_lib_input_cancel_text_size" />
@@ -164,7 +165,7 @@
164165
android:background="@drawable/dialog_utils_lib_input_cancel_button2"
165166
android:gravity="center"
166167
android:onClick="@{click::onClick}"
167-
android:padding="10dp"
168+
android:padding="@dimen/dialog_utils_lib_input_button_padding"
168169
android:text="@{cancelDesc}"
169170
android:textColor="@color/dialog_utils_lib_input_cancel_fg"
170171
android:textSize="@dimen/dialog_utils_lib_input_cancel_text_size" />
@@ -182,7 +183,7 @@
182183
android:background="@drawable/dialog_utils_lib_input_ok_button2"
183184
android:gravity="center"
184185
android:onClick="@{click::onClick}"
185-
android:padding="10dp"
186+
android:padding="@dimen/dialog_utils_lib_input_button_padding"
186187
android:text="@{okDesc}"
187188
android:textColor="@color/dialog_utils_lib_input_ok_fg"
188189
android:textSize="@dimen/dialog_utils_lib_input_ok_text_size" />

‎DialogFragmentUtilsLib/src/main/res/values/dimens.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4+
<!--标题内边距，适用于 DialogLibCommon、DialogLibInput、DialogLibCustom-->
5+
<dimen name="dialog_utils_lib_all_title_padding">10dp</dimen>
6+
<!--内容内边距，适用于 DialogLibCommon、DialogLibInput、DialogLibCustom-->
7+
<dimen name="dialog_utils_lib_all_content_padding">10dp</dimen>
8+
<!--按钮内边距，适用于 DialogLibCommon、DialogLibInput、DialogLibCustom-->
9+
<dimen name="dialog_utils_lib_all_button_padding">10dp</dimen>
10+
411
<!--标题字体大小，适用于 DialogLibCommon-->
512
<dimen name="dialog_utils_lib_common_title_text_size">14sp</dimen>
613
<!--确定 字体大小，适用于 DialogLibCommon-->
@@ -9,6 +16,12 @@
916
<dimen name="dialog_utils_lib_common_cancel_text_size">14sp</dimen>
1017
<!--内容 字体大小，适用于 DialogLibCommon-->
1118
<dimen name="dialog_utils_lib_common_content_text_size">14sp</dimen>
19+
<!--标题内边距，适用于 DialogLibCommon-->
20+
<dimen name="dialog_utils_lib_common_title_padding">@dimen/dialog_utils_lib_all_title_padding</dimen>
21+
<!--内容内边距，适用于 DialogLibCommon-->
22+
<dimen name="dialog_utils_lib_common_content_padding">@dimen/dialog_utils_lib_all_content_padding</dimen>
23+
<!--按钮内边距，适用于 DialogLibCommon-->
24+
<dimen name="dialog_utils_lib_common_button_padding">@dimen/dialog_utils_lib_all_button_padding</dimen>
1225

1326

1427
<!--标题字体大小，适用于 DialogLibInput-->
@@ -19,6 +32,13 @@
1932
<dimen name="dialog_utils_lib_input_cancel_text_size">14sp</dimen>
2033
<!--输入框 字体大小，适用于 DialogLibInput-->
2134
<dimen name="dialog_utils_lib_input_text_size">14sp</dimen>
35+
<!--标题内边距，适用于 DialogLibInput-->
36+
<dimen name="dialog_utils_lib_input_title_padding">@dimen/dialog_utils_lib_all_title_padding</dimen>
37+
<!--内容内边距，适用于 DialogLibInput-->
38+
<dimen name="dialog_utils_lib_input_content_padding">@dimen/dialog_utils_lib_all_content_padding</dimen>
39+
<!--按钮内边距，适用于 DialogLibInput-->
40+
<dimen name="dialog_utils_lib_input_button_padding">@dimen/dialog_utils_lib_all_button_padding</dimen>
41+
2242

2343

2444
<!--标题字体大小，适用于 DialogLibCustom-->
@@ -27,6 +47,12 @@
2747
<dimen name="dialog_utils_lib_custom_ok_text_size">14sp</dimen>
2848
<!--取消 字体大小，适用于 DialogLibCustom-->
2949
<dimen name="dialog_utils_lib_custom_cancel_text_size">14sp</dimen>
50+
<!--标题内边距，适用于 DialogLibCommon-->
51+
<dimen name="dialog_utils_lib_custom_title_padding">@dimen/dialog_utils_lib_all_title_padding</dimen>
52+
<!--内容内边距，适用于 DialogLibCommon-->
53+
<dimen name="dialog_utils_lib_custom_content_padding">@dimen/dialog_utils_lib_all_content_padding</dimen>
54+
<!--按钮内边距，适用于 DialogLibCommon-->
55+
<dimen name="dialog_utils_lib_custom_button_padding">@dimen/dialog_utils_lib_all_button_padding</dimen>
3056

3157

3258
<!--加载框 字体大小，适用于 DialogLibLoading 提示内容区域-->

‎DialogUtilsLib/src/main/res/layout/dialog_utils_lib_custom_view.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
android:layout_width="match_parent"
4545
android:layout_height="wrap_content"
4646
android:gravity="center"
47-
android:padding="10dp"
47+
android:padding="@dimen/dialog_utils_lib_custom_title_padding"
4848
android:text="@{title}"
4949
android:textColor="@color/dialog_utils_lib_custom_title_fg"
5050
android:textSize="@dimen/dialog_utils_lib_custom_title_text_size" />
@@ -59,7 +59,7 @@
5959
android:id="@+id/contentGroup"
6060
android:layout_width="match_parent"
6161
android:layout_height="wrap_content"
62-
android:padding="10dp" />
62+
android:padding="@dimen/dialog_utils_lib_custom_content_padding" />
6363

6464
<View
6565
android:layout_width="match_parent"
@@ -81,7 +81,7 @@
8181
android:background="@{noShowCancel ? @drawable/dialog_utils_lib_custom_ok_button_double : @drawable/dialog_utils_lib_custom_ok_button}"
8282
android:gravity="center"
8383
android:onClick="@{click::onClick}"
84-
android:padding="10dp"
84+
android:padding="@dimen/dialog_utils_lib_custom_button_padding"
8585
android:text="@{okDesc}"
8686
android:textColor="@color/dialog_utils_lib_custom_ok_fg"
8787
android:textSize="@dimen/dialog_utils_lib_custom_ok_text_size"
@@ -101,7 +101,7 @@
101101
android:background="@{noShowOk ? @drawable/dialog_utils_lib_custom_cancel_button_double : @drawable/dialog_utils_lib_custom_cancel_button}"
102102
android:gravity="center"
103103
android:onClick="@{click::onClick}"
104-
android:padding="10dp"
104+
android:padding="@dimen/dialog_utils_lib_custom_button_padding"
105105
android:text="@{cancelDesc}"
106106
android:textColor="@color/dialog_utils_lib_custom_cancel_fg"
107107
android:textSize="@dimen/dialog_utils_lib_custom_cancel_text_size"
@@ -123,7 +123,7 @@
123123
android:background="@{noShowOk ? @drawable/dialog_utils_lib_custom_cancel_button_double : @drawable/dialog_utils_lib_custom_cancel_button2}"
124124
android:gravity="center"
125125
android:onClick="@{click::onClick}"
126-
android:padding="10dp"
126+
android:padding="@dimen/dialog_utils_lib_custom_button_padding"
127127
android:text="@{cancelDesc}"
128128
android:textColor="@color/dialog_utils_lib_custom_cancel_fg"
129129
android:textSize="@dimen/dialog_utils_lib_custom_cancel_text_size"
@@ -143,7 +143,7 @@
143143
android:background="@{noShowCancel ? @drawable/dialog_utils_lib_custom_ok_button_double : @drawable/dialog_utils_lib_custom_ok_button2}"
144144
android:gravity="center"
145145
android:onClick="@{click::onClick}"
146-
android:padding="10dp"
146+
android:padding="@dimen/dialog_utils_lib_custom_button_padding"
147147
android:text="@{okDesc}"
148148
android:textColor="@color/dialog_utils_lib_custom_ok_fg"
149149
android:textSize="@dimen/dialog_utils_lib_custom_ok_text_size"

‎DialogUtilsLib/src/main/res/layout/dialog_utils_lib_tip.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
android:layout_width="match_parent"
4545
android:layout_height="wrap_content"
4646
android:gravity="center"
47-
android:padding="10dp"
47+
android:padding="@dimen/dialog_utils_lib_common_title_padding"
4848
android:text="@{title}"
4949
android:textColor="@color/dialog_utils_lib_common_title_fg"
5050
android:textSize="@dimen/dialog_utils_lib_common_title_text_size" />
@@ -62,7 +62,7 @@
6262
android:focusable="true"
6363
android:gravity="center"
6464
android:maxHeight="350dp"
65-
android:padding="10dp"
65+
android:padding="@dimen/dialog_utils_lib_common_content_padding"
6666
android:scrollbars="vertical"
6767
android:textColor="@color/dialog_utils_lib_common_content_fg"
6868
android:textSize="@dimen/dialog_utils_lib_common_content_text_size" />
@@ -87,7 +87,7 @@
8787
android:background="@{noShowCancel ? @drawable/dialog_utils_lib_common_ok_button_double : @drawable/dialog_utils_lib_common_ok_button}"
8888
android:gravity="center"
8989
android:onClick="@{click::onClick}"
90-
android:padding="10dp"
90+
android:padding="@dimen/dialog_utils_lib_common_button_padding"
9191
android:text="@{okDesc}"
9292
android:textColor="@color/dialog_utils_lib_common_ok_fg"
9393
android:textSize="@dimen/dialog_utils_lib_common_ok_text_size"
@@ -107,7 +107,7 @@
107107
android:background="@{noShowOk ? @drawable/dialog_utils_lib_common_cancel_button_double : @drawable/dialog_utils_lib_common_cancel_button}"
108108
android:gravity="center"
109109
android:onClick="@{click::onClick}"
110-
android:padding="10dp"
110+
android:padding="@dimen/dialog_utils_lib_common_button_padding"
111111
android:text="@{cancelDesc}"
112112
android:textColor="@color/dialog_utils_lib_common_cancel_fg"
113113
android:textSize="@dimen/dialog_utils_lib_common_cancel_text_size"
@@ -129,7 +129,7 @@
129129
android:background="@{noShowOk ? @drawable/dialog_utils_lib_common_cancel_button_double : @drawable/dialog_utils_lib_common_cancel_button2}"
130130
android:gravity="center"
131131
android:onClick="@{click::onClick}"
132-
android:padding="10dp"
132+
android:padding="@dimen/dialog_utils_lib_common_button_padding"
133133
android:text="@{cancelDesc}"
134134
android:textColor="@color/dialog_utils_lib_common_cancel_fg"
135135
android:textSize="@dimen/dialog_utils_lib_common_cancel_text_size"
@@ -149,7 +149,7 @@
149149
android:background="@{noShowCancel ? @drawable/dialog_utils_lib_common_ok_button_double : @drawable/dialog_utils_lib_common_ok_button2}"
150150
android:gravity="center"
151151
android:onClick="@{click::onClick}"
152-
android:padding="10dp"
152+
android:padding="@dimen/dialog_utils_lib_common_button_padding"
153153
android:text="@{okDesc}"
154154
android:textColor="@color/dialog_utils_lib_common_ok_fg"
155155
android:textSize="@dimen/dialog_utils_lib_common_ok_text_size"

0 commit comments

Comments
 (0)