diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json
index 631ee57e..8d4ebf66 100644
--- a/.changelog/lang_zh-Hans.json
+++ b/.changelog/lang_zh-Hans.json
@@ -9,10 +9,10 @@
"Android 15 部分页面状态栏背景着色区域不完整的问题 _[`issue #398`](http://issues.autojs6.com/398)_"
],
"improvement": [
-
+ "关于应用与开发者页面增加布局适配通用性并去除不必要的布局分类"
],
"dependency": [
-
+ "附加 Androidx ConstraintLayout 版本 2.2.1"
]
},
"v6.6.3": {
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 383f1c31..79367f0a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -53,6 +53,9 @@ dependencies /* Unclassified */ {
// SwipeRefreshLayout
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+ // ConstraintLayout
+ implementation("androidx.constraintlayout:constraintlayout:2.2.1")
+
// FlexboxLayout
implementation("com.google.android.flexbox:flexbox:3.0.0")
diff --git a/app/src/main/res/layout-h650dp-port/activity_about.xml b/app/src/main/res/layout-h650dp-port/activity_about.xml
deleted file mode 100644
index 4d3098ad..00000000
--- a/app/src/main/res/layout-h650dp-port/activity_about.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout-land/activity_about.xml b/app/src/main/res/layout-land/activity_about.xml
index bc2de93b..92ccd31b 100644
--- a/app/src/main/res/layout-land/activity_about.xml
+++ b/app/src/main/res/layout-land/activity_about.xml
@@ -32,21 +32,22 @@
+ android:textSize="@dimen/github_font_size_nickname_compat" />
@@ -144,10 +144,10 @@
@@ -173,7 +173,7 @@
@@ -184,7 +184,7 @@
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/about_app_version_info"
- android:textSize="16sp"
+ android:textSize="14sp"
android:text="@string/text_sample_string" />
@@ -202,10 +202,11 @@
+ android:textSize="@dimen/github_font_size_nickname_compat" />
@@ -291,29 +292,29 @@
-
-
+ android:layout_gravity="center" />
+
+
diff --git a/app/src/main/res/layout-h372dp-land/activity_about.xml b/app/src/main/res/layout-sw400dp-land/activity_about.xml
similarity index 92%
rename from app/src/main/res/layout-h372dp-land/activity_about.xml
rename to app/src/main/res/layout-sw400dp-land/activity_about.xml
index 82002763..c4c316ad 100644
--- a/app/src/main/res/layout-h372dp-land/activity_about.xml
+++ b/app/src/main/res/layout-sw400dp-land/activity_about.xml
@@ -32,21 +32,23 @@
@@ -173,7 +174,7 @@
@@ -202,10 +203,11 @@
+
+
-
-
+ android:layout_gravity="center" />
+
+
diff --git a/app/src/main/res/layout-w372dp-h650dp-port/activity_about.xml b/app/src/main/res/layout-w372dp-h650dp-port/activity_about.xml
deleted file mode 100644
index cdd1bc21..00000000
--- a/app/src/main/res/layout-w372dp-h650dp-port/activity_about.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout-w372dp-port/activity_about.xml b/app/src/main/res/layout-w372dp-port/activity_about.xml
deleted file mode 100644
index c6235a2d..00000000
--- a/app/src/main/res/layout-w372dp-port/activity_about.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout-w372dp/activity_about_function_buttons.xml b/app/src/main/res/layout-w372dp/activity_about_function_buttons.xml
deleted file mode 100644
index 75b6a1ff..00000000
--- a/app/src/main/res/layout-w372dp/activity_about_function_buttons.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout-w720dp/activity_about_function_buttons.xml b/app/src/main/res/layout-w720dp/activity_about_function_buttons.xml
deleted file mode 100644
index 6768adf5..00000000
--- a/app/src/main/res/layout-w720dp/activity_about_function_buttons.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 b574b3ca..ca109518 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -32,287 +32,337 @@
-
-
-
-
-
-
-
-
-
+ android:background="@android:color/transparent"
+ android:foreground="?selectableItemBackgroundBorderless">
-
+ android:layout_height="wrap_content">
-
+
+
+
+
+
+
+ android:layout_height="50dp"
+ android:orientation="vertical"
+ android:gravity="center">
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:layout_marginHorizontal="16dp"
+ android:layout_height="0dp"
+ android:layout_weight="3"
+ android:orientation="vertical"
+ android:gravity="center">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal" />
+
+
diff --git a/app/src/main/res/layout/activity_about_function_buttons.xml b/app/src/main/res/layout/activity_about_function_buttons.xml
index e65b4e8b..12e532d4 100644
--- a/app/src/main/res/layout/activity_about_function_buttons.xml
+++ b/app/src/main/res/layout/activity_about_function_buttons.xml
@@ -1,140 +1,249 @@
-
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:maxWidth="480dp"
+ android:layout_gravity="center"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
-
+
+
+ android:focusable="true"
+ android:clickable="true">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 329520ae..f59717c1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,17 +1,20 @@
50dp
+ 42dp
60dp
- 57dp
+ 54dp
16dp
6dp
16dp
12dp
1dp
18sp
+ 14sp
15sp
+ 12sp
5dp
- 4dp
+ 3dp
48dp
40dp
3dp