From 9587632c49b69cb00107e30bee3362edf3053a2b Mon Sep 17 00:00:00 2001
From: metacubex <maze.y2b@gmail.com>
Date: Thu, 29 Dec 2022 20:49:18 +0800
Subject: [PATCH] chore: adjust grid style

---
 .../com/github/kr328/clash/design/component/ProxyView.kt | 4 ++--
 .../kr328/clash/design/component/ProxyViewConfig.kt      | 9 ++++++---
 design/src/main/res/values/dimens.xml                    | 9 ++++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

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 @@
 
     <!--  Proxy Design -->
     <dimen name="proxy_layout_padding">3dp</dimen>
-    <dimen name="proxy_content_padding">6dp</dimen>
-    <dimen name="proxy_text_margin">5dp</dimen>
-    <dimen name="proxy_text_size">11sp</dimen>
+    <dimen name="proxy_content_padding">15dp</dimen>
+    <dimen name="proxy_content_padding_grid3">12dp</dimen>
+    <dimen name="proxy_text_margin">10dp</dimen>
+    <dimen name="proxy_text_margin_grid3">5dp</dimen>
+    <dimen name="proxy_text_size">12sp</dimen>
+    <dimen name="proxy_text_size_grid3">11sp</dimen>
     <dimen name="proxy_card_radius">5dp</dimen>
     <dimen name="proxy_card_offset">0dp</dimen>