Skip to content

Commit 20acc80

Browse files
author
Lesion
committed
bug: 修复ripple在低版本不兼容的问题
1 parent f1d445d commit 20acc80

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:color="#ffffff"
5+
tools:ignore="NewApi">
6+
<item android:drawable="@drawable/image_edit_click_ripple"/>
7+
</ripple>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<solid android:color="@color/image_editor_main_backgroud" />
5+
<corners android:radius="2dp" />
6+
</shape>
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
android:color="#ffffff"
5-
tools:ignore="NewApi">
6-
<item android:drawable="@drawable/image_edit_click_ripple"/>
7-
</ripple>
4+
android:color="#ffffff">
5+
<item android:drawable="@drawable/image_edit_click_ripple" android:state_pressed="true"/>
6+
<item android:drawable="@drawable/image_edit_click_ripple_normal"/>
7+
</selector>

imageeditlibrary/src/main/res/drawable/image_editor_materialcolorpicker__color_button.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

imageeditlibrary/src/main/res/values/colors.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<resources>
22
<color name="image_editor_white">#ffffff</color>
33
<color name="image_editor_main_backgroud">#4f000000</color>
4+
<color name="image_editor_main_backgroud_normal">#33000000</color>
45
<color name="image_editor_materialcolorpicker__white">#ffffff</color>
56
<color name="image_editor_materialcolorpicker__red">#f44336</color>
67
<color name="image_editor_materialcolorpicker__green">#4caf50</color>

0 commit comments

Comments
 (0)