From c08bbf7b741dd69745c636ba4851d0ff967ce542 Mon Sep 17 00:00:00 2001
From: BigPickle <BigPickle@WinBoLL.CC>
Date: Thu, 4 Jun 2026 18:03:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4LogView=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8DAboutView=E5=9C=A8Android=2016?=
 =?UTF-8?q?=E4=B8=8A=E7=9A=84Inflate=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除主窗口 activity_main.xml 底部 LogView 面板，清理 MainActivity.java 中相关字段与 onResume 调用，修复 NPE 崩溃
- MyAppTheme 补充 aboutViewBackgroundColor/aboutViewTextColor/aboutViewTitleColor/aboutViewDividerColor 属性定义，修复 AboutActivity 在 Android 16 上的 UnsupportedOperationException 崩溃
---
 gitsion/build.properties                           |  4 ++--
 .../cc/winboll/studio/gitsion/MainActivity.java    | 12 ++++--------
 gitsion/src/main/res/layout/activity_main.xml      | 14 --------------
 gitsion/src/main/res/values/styles.xml             |  4 ++++
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/gitsion/build.properties b/gitsion/build.properties
index b74b676..c1c98f9 100644
--- a/gitsion/build.properties
+++ b/gitsion/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jun 04 17:48:23 HKT 2026
+#Thu Jun 04 18:00:38 HKT 2026
 stageCount=27
 libraryProject=
 baseVersion=15.11
 publishVersion=15.11.26
-buildCount=43
+buildCount=46
 baseBetaVersion=15.11.27
diff --git a/gitsion/src/main/java/cc/winboll/studio/gitsion/MainActivity.java b/gitsion/src/main/java/cc/winboll/studio/gitsion/MainActivity.java
index d6d3503..df7699c 100644
--- a/gitsion/src/main/java/cc/winboll/studio/gitsion/MainActivity.java
+++ b/gitsion/src/main/java/cc/winboll/studio/gitsion/MainActivity.java
@@ -20,7 +20,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.gitsion.R;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.LogView;
+
 import cc.winboll.studio.libappbase.ToastUtils;
 
 /**
@@ -33,7 +33,7 @@ public final class MainActivity extends AppCompatActivity {
 
     //原有控件
     private Toolbar mToolbar;
-    private LogView mLogView;
+
     private Switch mSwitchService;
 
     //新增
@@ -81,7 +81,7 @@ public final class MainActivity extends AppCompatActivity {
     private void initView() {
         //原有
         mToolbar = findViewById(R.id.toolbar);
-        mLogView = findViewById(R.id.logview);
+
         mSwitchService = findViewById(R.id.switch_service);
 
         //新增
@@ -366,10 +366,6 @@ public final class MainActivity extends AppCompatActivity {
         }
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
+
 }
 
diff --git a/gitsion/src/main/res/layout/activity_main.xml b/gitsion/src/main/res/layout/activity_main.xml
index d1063a5..80a4afa 100644
--- a/gitsion/src/main/res/layout/activity_main.xml
+++ b/gitsion/src/main/res/layout/activity_main.xml
@@ -180,19 +180,5 @@
 
 	</ScrollView>
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="200dp"
-		android:orientation="vertical"
-		android:id="@+id/container_log_show"
-		android:background="@drawable/border_gray">
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/logview"/>
-
-	</LinearLayout>
-
 </LinearLayout>
 
diff --git a/gitsion/src/main/res/values/styles.xml b/gitsion/src/main/res/values/styles.xml
index 6345c33..1dc037d 100644
--- a/gitsion/src/main/res/values/styles.xml
+++ b/gitsion/src/main/res/values/styles.xml
@@ -17,6 +17,10 @@
         <item name="activityBackgroundColor">?attr/mainWindowBackgroundColor</item>
         <item name="activityTextColor">?attr/mainWindowTextColor</item>
         <item name="debugTextColor">@color/debugTextColor</item>
+        <item name="aboutViewBackgroundColor">?attr/mainWindowBackgroundColor</item>
+        <item name="aboutViewTextColor">?attr/mainWindowTextColor</item>
+        <item name="aboutViewTitleColor">?attr/mainWindowTextColor</item>
+        <item name="aboutViewDividerColor">?attr/mainWindowDarkTextColor</item>
     </style>
 
     <style name="DebugActivityTheme" parent="Theme.AppCompat.Light.NoActionBar">