修改图标大小使其更加美观

ooftf · Jan 9, 2018 · 93ab4e0 · 93ab4e0
1 parent 4a23955
commit 93ab4e0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -76,8 +76,8 @@ dependencies {
 |oet_drawableShow|显示密码icon id  |参照效果图|
 |oet_drawableHide|隐藏密码icon id  |参照效果图|
 |oet_drawableDel|清除密码icon id  |参照效果图|
-|oet_delDrawableSize| 清除图标的大小 |20dp|
-|oet_maskDrawableSize|密显图标的大小  |24dp|
+|oet_delDrawableSize| 清除图标的大小 |17dp|
+|oet_maskDrawableSize|密显图标的大小  |20dp|
 |oet_drawableMargin|清除图标和密显转换图标之间的距离|8dp|
 |oet_maskEnabled|是否开启密显转换功能  |false|
 |oet_delEnabled|是否开启清除功能  |false|
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -28,5 +28,5 @@
         android:paddingLeft="16dp"
         app:oet_delEnabled="true"
         app:oet_drawableMargin="8dp"
-        app:oet_maskEnabled="false" />
+        app:oet_maskEnabled="true" />
 </LinearLayout>
diff --git a/lib/src/main/java/com/ooftf/operation/OperationEditText.kt b/lib/src/main/java/com/ooftf/operation/OperationEditText.kt
@@ -17,8 +17,8 @@ class OperationEditText : EditText {
     private var drawableDelId = R.drawable.vector_icon_del
     private var maskEnabled = false
     private var delEnabled = false
-    private var drawableMaskSize = dip2px(context, 24f)
-    private var drawableDelSize = dip2px(context, 20f)
+    private var drawableMaskSize = dip2px(context, 20f)
+    private var drawableDelSize = dip2px(context, 17f)
     private var drawableMargin = dip2px(context, 8f)
 
     constructor(context: Context?) : super(context)

diff --git a/lib/src/main/java/com/ooftf/operation/OperationEditTextLayout.kt b/lib/src/main/java/com/ooftf/operation/OperationEditTextLayout.kt
@@ -14,8 +14,8 @@ import android.widget.RelativeLayout
 
 
 /**
- *  删除按钮的大小为40dp
- *  隐藏转换按钮的大小为38dp
+ *
+ *  删除按钮,隐藏转换按钮的大小为28dp
  * Created by master on 2017/10/17 0017.
  */
 class OperationEditTextLayout : RelativeLayout {

diff --git a/lib/src/main/res/layout/layout_edit_operation.xml b/lib/src/main/res/layout/layout_edit_operation.xml
@@ -12,14 +12,14 @@
         android:id="@+id/mask"
         android:layout_width="28dp"
         android:layout_height="28dp"
-        android:padding="5dp"
+        android:padding="4dp"
         android:scaleType="fitCenter" />
 
     <ImageView
         android:id="@+id/del"
         android:layout_width="28dp"
         android:layout_height="28dp"
-        android:padding="6dp"
+        android:padding="5.5dp"
         android:scaleType="fitCenter" />
 
 </LinearLayout>