Commit 14f7598cdef3003286cc35af425e2bb8824c0450
1 parent
0d1c259a
1 修复checkbox默认状态显示异常问题,调整二维码icon大小
Showing
4 changed files
with
9 additions
and
3 deletions
config.gradle
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/frame/view/InvitFriendView.java
| @@ -113,7 +113,7 @@ public class InvitFriendView implements MvpView { | @@ -113,7 +113,7 @@ public class InvitFriendView implements MvpView { | ||
| 113 | if (null == logo) { | 113 | if (null == logo) { |
| 114 | return; | 114 | return; |
| 115 | } | 115 | } |
| 116 | - Bitmap bitmap = service.createQrIconBitMap(encryptionContent, DensityUtil.dp2px(getContext(), 245), logo, 20); | 116 | + Bitmap bitmap = service.createQrIconBitMap(encryptionContent, DensityUtil.dp2px(getContext(), 245), logo, 10); |
| 117 | // binding.ivQr.setBackgroundDrawable(bitmap); | 117 | // binding.ivQr.setBackgroundDrawable(bitmap); |
| 118 | if (getContext() == null) { | 118 | if (getContext() == null) { |
| 119 | return; | 119 | return; |
module_xiaojiaSoundBox/src/main/res/layout/item_list_select_im_contact.xml
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 36 | android:layout_height="21dp" | 36 | android:layout_height="21dp" |
| 37 | android:layout_marginLeft="10dp" | 37 | android:layout_marginLeft="10dp" |
| 38 | android:layout_marginRight="20dp" | 38 | android:layout_marginRight="20dp" |
| 39 | - android:background="@drawable/selector_checkbox" | 39 | + style="@style/CustomCheckboxHasDefault" |
| 40 | android:button="@null" | 40 | android:button="@null" |
| 41 | android:clickable="false" | 41 | android:clickable="false" |
| 42 | android:focusable="false" /> | 42 | android:focusable="false" /> |
module_xiaojiaSoundBox/src/main/res/values/styles.xml
| @@ -15,6 +15,12 @@ | @@ -15,6 +15,12 @@ | ||
| 15 | <item name="android:maxHeight">21dp</item> | 15 | <item name="android:maxHeight">21dp</item> |
| 16 | <item name="android:background">@drawable/selector_checkbox_no_default</item> | 16 | <item name="android:background">@drawable/selector_checkbox_no_default</item> |
| 17 | </style> | 17 | </style> |
| 18 | + | ||
| 19 | + <style name="CustomCheckboxHasDefault" parent="@android:style/Widget.CompoundButton.CheckBox"> | ||
| 20 | + <item name="android:button">@null</item> | ||
| 21 | + <item name="android:maxHeight">21dp</item> | ||
| 22 | + <item name="android:background">@drawable/selector_checkbox</item> | ||
| 23 | + </style> | ||
| 18 | <!-- switch--> | 24 | <!-- switch--> |
| 19 | <style name="SwitchButtonMD" tools:ignore="ResourceName"> | 25 | <style name="SwitchButtonMD" tools:ignore="ResourceName"> |
| 20 | <item name="kswThumbDrawable">@drawable/ksw_md_thumb</item> | 26 | <item name="kswThumbDrawable">@drawable/ksw_md_thumb</item> |