Skip to content

Commit b17a1d8

Browse files
committed
Update
1 parent 2a15906 commit b17a1d8

6 files changed

Lines changed: 15 additions & 6 deletions

File tree

app/src/main/res/drawable/btn_bg_active_large.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
4-
<solid android:color="#3F9C9C9C" />
4+
<solid android:color="#3F828282" />
55
<!-- 设置按钮的四个角为弧形 -->
66
<!-- android:radius 弧形的半径 -->
77
<corners android:radius="25dp" />

app/src/main/res/drawable/btn_bg_disabled_large.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
44
<!-- 填充的颜色:这里设置背景透明 -->
5-
<solid android:color="#68888888" />
5+
<solid android:color="#58888888" />
66
<!-- 边框的颜色 :不能和窗口背景色一样-->
77
<stroke
88
android:width="1dp"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
2+
<solid android:color="?attr/colorParse"/>
3+
<corners android:radius="25dp"/>
4+
<padding
5+
android:bottom="0dp"
6+
android:left="0dp"
7+
android:right="0dp"
8+
android:top="0dp" />
9+
</shape>

app/src/main/res/drawable/btn_bg_large_secondary.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33
<item android:drawable="@drawable/btn_bg_active_large" android:state_pressed="true" />
44
<item android:drawable="@drawable/btn_bg_disabled_large" android:state_enabled="false" />
5-
<item android:drawable="@drawable/btn_bg_inactive_large_secondary" />
5+
<item android:drawable="@drawable/btn_bg_large_default" />
66
</selector>

app/src/main/res/drawable/btn_bg_large_warning.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33
<item android:drawable="@drawable/btn_bg_active_large" android:state_pressed="true" />
44
<item android:drawable="@drawable/btn_bg_disabled_large" android:state_enabled="false" />
5-
<item android:drawable="@drawable/btn_bg_inactive_large_warning" />
5+
<item android:drawable="@drawable/btn_bg_large_default" />
66
</selector>

app/src/main/res/values/styles.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,12 +257,12 @@
257257
</style>
258258

259259
<style name="dialogConfirmBtn" parent="dialogLargeBtn">
260-
<item name="android:textColor">#E5E5E5</item>
260+
<item name="android:textColor">#FFFFFF</item>
261261
<item name="android:background">@drawable/btn_bg_large</item>
262262
</style>
263263

264264
<style name="dialogWarningBtn" parent="dialogLargeBtn">
265-
<item name="android:textColor">#E5E5E5</item>
265+
<item name="android:textColor">#FFFFFF</item>
266266
<item name="android:background">@drawable/btn_bg_large_warning</item>
267267
</style>
268268

0 commit comments

Comments
 (0)