Commit 840e11da7ddbde72183d2f15bcd3bb8c1bd5ea4f
1 parent
14f7598c
1 修复checkbox默认状态显示异常问题,调整二维码icon大小
Showing
21 changed files
with
17 additions
and
17 deletions
config.gradle
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_normal.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_xiaojia_normal.png
1.25 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_normal_no_enable.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_xiaojia_normal_no_enable.png
1.37 KB
module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_press.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-hdpi/check_xiaojia_press.png
1.43 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_normal.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_xiaojia_normal.png
1.16 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_normal_no_enable.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_xiaojia_normal_no_enable.png
1.34 KB
module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_press.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xhdpi/check_xiaojia_press.png
1.45 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_normal.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_xiaojia_normal.png
2.48 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_normal_no_enable.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_xiaojia_normal_no_enable.png
2.74 KB
module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_press.png renamed to module_xiaojiaSoundBox/src/main/res/drawable-xxhdpi/check_xiaojia_press.png
2.86 KB
module_xiaojiaSoundBox/src/main/res/drawable/selector_btn_gray.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <selector xmlns:android="http://schemas.android.com/apk/res/android"> | 2 | <selector xmlns:android="http://schemas.android.com/apk/res/android"> |
| 3 | - <item android:drawable="@drawable/shape_btn_gray" android:state_pressed="false" /> | 3 | + <item android:drawable="@drawable/shape_xiaojia_btn_gray" android:state_pressed="false" /> |
| 4 | <item android:drawable="@drawable/shape_btn_press" android:state_pressed="true" /> | 4 | <item android:drawable="@drawable/shape_btn_press" android:state_pressed="true" /> |
| 5 | 5 | ||
| 6 | </selector> | 6 | </selector> |
| 7 | \ No newline at end of file | 7 | \ No newline at end of file |
module_xiaojiaSoundBox/src/main/res/drawable/selector_btn_green.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <selector xmlns:android="http://schemas.android.com/apk/res/android"> | 2 | <selector xmlns:android="http://schemas.android.com/apk/res/android"> |
| 3 | - <item android:drawable="@drawable/shape_btn_green" android:state_pressed="false" /> | 3 | + <item android:drawable="@drawable/shape_xiaojia_btn_green" android:state_pressed="false" /> |
| 4 | <item android:drawable="@drawable/shape_btn_press" android:state_pressed="true" /> | 4 | <item android:drawable="@drawable/shape_btn_press" android:state_pressed="true" /> |
| 5 | 5 | ||
| 6 | </selector> | 6 | </selector> |
| 7 | \ No newline at end of file | 7 | \ No newline at end of file |
module_xiaojiaSoundBox/src/main/res/drawable/selector_checkbox.xml deleted
100644 → 0
| 1 | -<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | -<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | - <item android:drawable="@drawable/check_press" android:state_checked="true"/> | ||
| 4 | - <item android:drawable="@drawable/check_normal" android:state_checked="false" android:state_enabled="true" /> | ||
| 5 | - <item android:drawable="@drawable/check_normal_no_enable" android:state_checked="false" android:state_enabled="false" /> | ||
| 6 | - | ||
| 7 | -</selector> | ||
| 8 | \ No newline at end of file | 0 | \ No newline at end of file |
module_xiaojiaSoundBox/src/main/res/drawable/selector_checkbox_no_default.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <selector xmlns:android="http://schemas.android.com/apk/res/android"> | 2 | <selector xmlns:android="http://schemas.android.com/apk/res/android"> |
| 3 | - <item android:drawable="@drawable/check_press" android:state_checked="true"/> | ||
| 4 | - <item android:drawable="@drawable/check_normal" android:state_checked="false" /> | 3 | + <item android:drawable="@drawable/check_xiaojia_press" android:state_checked="true"/> |
| 4 | + <item android:drawable="@drawable/check_xiaojia_normal" android:state_checked="false" /> | ||
| 5 | 5 | ||
| 6 | </selector> | 6 | </selector> |
| 7 | \ No newline at end of file | 7 | \ No newline at end of file |
module_xiaojiaSoundBox/src/main/res/drawable/selector_xiaojia_checkbox.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | +<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| 3 | + <item android:drawable="@drawable/check_xiaojia_press" android:state_checked="true"/> | ||
| 4 | + <item android:drawable="@drawable/check_xiaojia_normal" android:state_checked="false" android:state_enabled="true" /> | ||
| 5 | + <item android:drawable="@drawable/check_xiaojia_normal_no_enable" android:state_checked="false" android:state_enabled="false" /> | ||
| 6 | + | ||
| 7 | +</selector> | ||
| 0 | \ No newline at end of file | 8 | \ No newline at end of file |
module_xiaojiaSoundBox/src/main/res/drawable/shape_btn_gray.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_btn_gray.xml
module_xiaojiaSoundBox/src/main/res/drawable/shape_btn_green.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_btn_green.xml
module_xiaojiaSoundBox/src/main/res/drawable/shape_green_circle.xml renamed to module_xiaojiaSoundBox/src/main/res/drawable/shape_xiaojia_green_circle.xml
module_xiaojiaSoundBox/src/main/res/layout/activity_change_device_name.xml
| @@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
| 77 | android:layout_marginLeft="30dp" | 77 | android:layout_marginLeft="30dp" |
| 78 | android:layout_marginTop="20dp" | 78 | android:layout_marginTop="20dp" |
| 79 | android:layout_marginRight="30dp" | 79 | android:layout_marginRight="30dp" |
| 80 | - android:background="@drawable/shape_btn_gray" | 80 | + android:background="@drawable/shape_xiaojia_btn_gray" |
| 81 | android:clickable="false" | 81 | android:clickable="false" |
| 82 | android:text="保存" | 82 | android:text="保存" |
| 83 | android:textColor="@color/white" | 83 | android:textColor="@color/white" |
module_xiaojiaSoundBox/src/main/res/layout/fragment_invit_friend.xml
| @@ -115,7 +115,7 @@ | @@ -115,7 +115,7 @@ | ||
| 115 | <TextView | 115 | <TextView |
| 116 | android:layout_width="15dp" | 116 | android:layout_width="15dp" |
| 117 | android:layout_height="15dp" | 117 | android:layout_height="15dp" |
| 118 | - android:background="@drawable/shape_green_circle" | 118 | + android:background="@drawable/shape_xiaojia_green_circle" |
| 119 | android:gravity="center" | 119 | android:gravity="center" |
| 120 | android:text="1" | 120 | android:text="1" |
| 121 | android:textColor="@color/white" | 121 | android:textColor="@color/white" |
| @@ -135,7 +135,7 @@ | @@ -135,7 +135,7 @@ | ||
| 135 | <TextView | 135 | <TextView |
| 136 | android:layout_width="15dp" | 136 | android:layout_width="15dp" |
| 137 | android:layout_height="15dp" | 137 | android:layout_height="15dp" |
| 138 | - android:background="@drawable/shape_green_circle" | 138 | + android:background="@drawable/shape_xiaojia_green_circle" |
| 139 | android:gravity="center" | 139 | android:gravity="center" |
| 140 | android:text="2" | 140 | android:text="2" |
| 141 | android:textColor="@color/white" | 141 | android:textColor="@color/white" |
| @@ -155,7 +155,7 @@ | @@ -155,7 +155,7 @@ | ||
| 155 | <TextView | 155 | <TextView |
| 156 | android:layout_width="15dp" | 156 | android:layout_width="15dp" |
| 157 | android:layout_height="15dp" | 157 | android:layout_height="15dp" |
| 158 | - android:background="@drawable/shape_green_circle" | 158 | + android:background="@drawable/shape_xiaojia_green_circle" |
| 159 | android:gravity="center" | 159 | android:gravity="center" |
| 160 | android:text="3" | 160 | android:text="3" |
| 161 | android:textColor="@color/white" | 161 | android:textColor="@color/white" |
module_xiaojiaSoundBox/src/main/res/values/styles.xml
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | <style name="CustomCheckboxHasDefault" parent="@android:style/Widget.CompoundButton.CheckBox"> | 19 | <style name="CustomCheckboxHasDefault" parent="@android:style/Widget.CompoundButton.CheckBox"> |
| 20 | <item name="android:button">@null</item> | 20 | <item name="android:button">@null</item> |
| 21 | <item name="android:maxHeight">21dp</item> | 21 | <item name="android:maxHeight">21dp</item> |
| 22 | - <item name="android:background">@drawable/selector_checkbox</item> | 22 | + <item name="android:background">@drawable/selector_xiaojia_checkbox</item> |
| 23 | </style> | 23 | </style> |
| 24 | <!-- switch--> | 24 | <!-- switch--> |
| 25 | <style name="SwitchButtonMD" tools:ignore="ResourceName"> | 25 | <style name="SwitchButtonMD" tools:ignore="ResourceName"> |