From c2345e62ba02b40527df818329269c4a17923d7b Mon Sep 17 00:00:00 2001
From: Cold-Mint <cold_mint@qq.com>
Date: Sat, 8 Feb 2025 23:10:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(layout):=20=E8=B0=83=E6=95=B4=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 NestedScrollView 中不必要的 layout_above 属性
- 添加了多个 dontwarn 规则，以解决潜在的警告问题
- 保持了 OkHttp 和 BouncyCastle相关类，以确保应用的正常运行
---
 app/proguard-rules.pro                     | 20 +++++++++++++++++++-
 app/src/main/res/layout/activity_about.xml |  1 -
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index f9c5299..6d778c4 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -60,4 +60,22 @@
 -keepclassmembers enum * {
     public static **[] values();
     public static ** valueOf(java.lang.String);
-}
\ No newline at end of file
+}
+
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
+
+# 保持 OkHttp 平台相关的类
+-keep class okhttp3.internal.platform.** { *; }
+
+# 保持 BouncyCastle 相关的类
+-keep class org.bouncycastle.** { *; }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 620a94e..5b02b5e 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -72,7 +72,6 @@
             <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_above="@id/action_divider"
                 android:layout_alignParentTop="true"
                 android:layout_marginBottom="8dp">