From ab1052da0d35105ac86a9ee3e2216b70761afe43 Mon Sep 17 00:00:00 2001 From: xinyu Date: Thu, 11 Apr 2019 11:54:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E5=BC=80/=E6=94=B6=E8=B5=B7=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=82=B9=E5=87=BB=E5=8C=BA=E5=9F=9F=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yuyh/jsonviewer/library/view/JsonItemView.java | 14 +++++++++++--- .../res/layout/jsonviewer_layout_item_view.xml | 2 -- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/jsonviewer/src/main/java/com/yuyh/jsonviewer/library/view/JsonItemView.java b/jsonviewer/src/main/java/com/yuyh/jsonviewer/library/view/JsonItemView.java index 88d022b..1f8eb76 100644 --- a/jsonviewer/src/main/java/com/yuyh/jsonviewer/library/view/JsonItemView.java +++ b/jsonviewer/src/main/java/com/yuyh/jsonviewer/library/view/JsonItemView.java @@ -68,10 +68,13 @@ public void setTextSize(float textSizeDp) { int textSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, TEXT_SIZE_DP, getResources().getDisplayMetrics()); LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) mIvIcon.getLayoutParams(); - layoutParams.height = textSize; - layoutParams.width = textSize; - layoutParams.topMargin = textSize / 5; + int padding = dip2px(2); + int paddingRight = padding + dip2px(1); + layoutParams.height = LinearLayout.LayoutParams.MATCH_PARENT; + layoutParams.width = textSize + (paddingRight - padding); + layoutParams.setMargins(0,0,0,0); + mIvIcon.setPadding(padding, textSize / 5, paddingRight, 0); mIvIcon.setLayoutParams(layoutParams); } @@ -129,4 +132,9 @@ public void addViewNoInvalidate(View child) { } addViewInLayout(child, -1, params); } + + private int dip2px (float dipValue) { + final float scale = getResources().getDisplayMetrics().density; + return (int) (dipValue * scale + 0.5f); + } } diff --git a/jsonviewer/src/main/res/layout/jsonviewer_layout_item_view.xml b/jsonviewer/src/main/res/layout/jsonviewer_layout_item_view.xml index 306002e..2222b16 100644 --- a/jsonviewer/src/main/res/layout/jsonviewer_layout_item_view.xml +++ b/jsonviewer/src/main/res/layout/jsonviewer_layout_item_view.xml @@ -33,8 +33,6 @@ android:id="@+id/tv_right" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="1dp" - android:layout_marginStart="1dp" android:gravity="center_vertical" android:textSize="12sp" android:visibility="gone"