diff --git a/design/src/main/java/com/github/kr328/clash/design/component/ProxyView.kt b/design/src/main/java/com/github/kr328/clash/design/component/ProxyView.kt index 1b8a807c..2f2c0500 100644 --- a/design/src/main/java/com/github/kr328/clash/design/component/ProxyView.kt +++ b/design/src/main/java/com/github/kr328/clash/design/component/ProxyView.kt @@ -40,9 +40,9 @@ class ProxyView( } val textHeight = state.rect.height() - val exceptHeight = (state.config.layoutPadding * 4 + + val exceptHeight = (state.config.layoutPadding * 2 + state.config.contentPadding * 2 + - textHeight * 4 + + textHeight * 2 + state.config.textMargin).toInt() val height = when (MeasureSpec.getMode(heightMeasureSpec)) { diff --git a/design/src/main/java/com/github/kr328/clash/design/component/ProxyViewConfig.kt b/design/src/main/java/com/github/kr328/clash/design/component/ProxyViewConfig.kt index eac9b045..80a14ca7 100644 --- a/design/src/main/java/com/github/kr328/clash/design/component/ProxyViewConfig.kt +++ b/design/src/main/java/com/github/kr328/clash/design/component/ProxyViewConfig.kt @@ -21,9 +21,12 @@ class ProxyViewConfig(val context: Context, var proxyLine: Int) { get() = if (proxyLine==1) Color.TRANSPARENT else colorSurface val layoutPadding = context.getPixels(R.dimen.proxy_layout_padding).toFloat() - val contentPadding = context.getPixels(R.dimen.proxy_content_padding).toFloat() - val textMargin = context.getPixels(R.dimen.proxy_text_margin) - val textSize = context.getPixels(R.dimen.proxy_text_size).toFloat() + val contentPadding + get() = if (proxyLine==2) context.getPixels(R.dimen.proxy_content_padding).toFloat() else context.getPixels(R.dimen.proxy_content_padding_grid3).toFloat() + val textMargin + get() = if (proxyLine==2) context.getPixels(R.dimen.proxy_text_margin).toFloat() else context.getPixels(R.dimen.proxy_text_margin_grid3).toFloat() + val textSize + get() = if (proxyLine==2) context.getPixels(R.dimen.proxy_text_size).toFloat() else context.getPixels(R.dimen.proxy_text_size_grid3).toFloat() val shadow = Color.argb( 0x15, diff --git a/design/src/main/res/values/dimens.xml b/design/src/main/res/values/dimens.xml index 62c0dfc2..002d9271 100644 --- a/design/src/main/res/values/dimens.xml +++ b/design/src/main/res/values/dimens.xml @@ -65,9 +65,12 @@ 3dp - 6dp - 5dp - 11sp + 15dp + 12dp + 10dp + 5dp + 12sp + 11sp 5dp 0dp