From 4e15482b7d6b6936b6c9cc8bc29a6211caeb0c1a Mon Sep 17 00:00:00 2001
From: yuqian <yuqian@lux-ad.com>
Date: Fri, 19 Dec 2025 16:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B5=E6=B1=A0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myphoneinfo/dashboard/HardWareFragment.kt |   2 +-
 .../dashboard/SystemShowFragment.kt           |   2 +
 .../src/main/res/layout/fragment_battery.xml  | 159 ++++--------------
 myphoneinfo/src/main/res/values/strings.xml   |   1 +
 4 files changed, 34 insertions(+), 130 deletions(-)

diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt
index a8c7bf3..de83e00 100644
--- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt
+++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/HardWareFragment.kt
@@ -37,7 +37,7 @@ class HardWareFragment : Fragment() {
             var intent=Intent(requireContext(), AnalysisActivity::class.java)
             startActivity(intent)
         }
-        binding.pair1.setOnClickListener {
+        binding.bluetoothLayout.pair1.setOnClickListener {
             dialogBlueTooth= dialogBlueTooth?: DialogBlueTooth()
             println("showBluetoothDialog"+AndInfo.instance.bluetooth.bondedDevices.size)
             dialogBlueTooth?.show(childFragmentManager, "BlueTooth1")
diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/SystemShowFragment.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/SystemShowFragment.kt
index 17bbecd..3063d42 100644
--- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/SystemShowFragment.kt
+++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/SystemShowFragment.kt
@@ -73,7 +73,9 @@ private lateinit var binding: FragmentSystemShowBinding
         binding.textOp17.textTitle.text=getString(R.string.ssl_version)
         binding.textOp18.textTitle.text=getString(R.string.language)
         binding.textOp19.textTitle.text=getString(R.string.usb_debugging)
+        //内核
         binding.textOp20.textTitle.text=getString(R.string.kernel)
+        binding.textOp20.textContent.text=AndInfo.instance.build.kernelCompleteVersion
 
 
         binding.textclear1.textTitle.text=getString(R.string.vendor)
diff --git a/myphoneinfo/src/main/res/layout/fragment_battery.xml b/myphoneinfo/src/main/res/layout/fragment_battery.xml
index 2395374..f2dd6ef 100644
--- a/myphoneinfo/src/main/res/layout/fragment_battery.xml
+++ b/myphoneinfo/src/main/res/layout/fragment_battery.xml
@@ -59,8 +59,10 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/signalStrength"
-                        style="@style/TextBatteryLogo"
+                        style="@style/TextTitleBig"
                         android:layout_width="150dp"
+                        android:textSize="36sp"
+                        android:textStyle="bold"
                         android:layout_height="wrap_content"
                         android:text="100%"
                         android:textAlignment="center" />
@@ -75,11 +77,11 @@
 
                         <com.google.android.material.textview.MaterialTextView
                             android:id="@+id/conText1"
-                            style="@style/TextButteryRight"
+                            style="@style/LeftContent"
+                            android:textColor="@color/module_title_color"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/not_charged"
-                            android:textStyle="bold"
                             tools:ignore="RelativeOverlap" />
 
                         <LinearLayout
@@ -88,20 +90,20 @@
                             android:orientation="horizontal">
 
                             <com.google.android.material.textview.MaterialTextView
-                                style="@style/TextButteryRight"
+                                style="@style/LeftContent"
+                                android:textColor="@color/module_title_color"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="current"
-                                android:textStyle="bold"
+                                android:text="@string/current"
                                 tools:ignore="RelativeOverlap" />
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/conTExt3"
-                                style="@style/TextButteryRight"
+                                style="@style/LeftContent"
+                                android:textColor="@color/module_title_color"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text=" 22 mA"
-                                android:textStyle="bold"
                                 tools:ignore="RelativeOverlap" />
                         </LinearLayout>
 
@@ -111,20 +113,20 @@
                             android:orientation="horizontal">
 
                             <com.google.android.material.textview.MaterialTextView
-                                style="@style/TextButteryRight"
+                                style="@style/LeftContent"
+                                android:textColor="@color/module_title_color"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:text="Power"
-                                android:textStyle="bold"
+                                android:text="@string/power"
                                 tools:ignore="RelativeOverlap" />
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/conTExt4"
-                                style="@style/TextButteryRight"
+                                style="@style/LeftContent"
+                                android:textColor="@color/module_title_color"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text=" 0.5 W"
-                                android:textStyle="bold"
                                 tools:ignore="RelativeOverlap" />
                         </LinearLayout>
                     </LinearLayout>
@@ -148,122 +150,21 @@
                     android:layout_height="wrap_content"
                     android:text="@string/information"
                     tools:ignore="RelativeOverlap" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informTitle1"
-                        style="@style/LeftContent"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/temperature"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informDev1"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informTitle2"
-                        style="@style/LeftContent"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/technology"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informDev2"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informTitle3"
-                        style="@style/LeftContent"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/health_status"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informDev3"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informTitle4"
-                        style="@style/LeftContent"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/maximum_output"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informDev4"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:orientation="horizontal">
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informTitle5"
-                        style="@style/LeftContent"
-                        android:layout_width="150dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/capacity_system_feedback"
-                        android:textStyle="bold" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/informDev5"
-                        style="@style/TextContentRight"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="20dp"
-                        android:text="@string/apps"
-                        tools:ignore="RelativeOverlap" />
-                </LinearLayout>
+                <include
+                    android:id="@+id/info1"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/info2"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/info3"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/info4"
+                    layout="@layout/common_text_style" />
+                <include
+                    android:id="@+id/info5"
+                    layout="@layout/common_text_style" />
             </LinearLayout>
 
         </LinearLayout>
diff --git a/myphoneinfo/src/main/res/values/strings.xml b/myphoneinfo/src/main/res/values/strings.xml
index 19a1370..cc778df 100644
--- a/myphoneinfo/src/main/res/values/strings.xml
+++ b/myphoneinfo/src/main/res/values/strings.xml
@@ -291,4 +291,5 @@
     <string name="google_play_services_version">Google Play Services version</string>
     <string name="toybox">Toybox</string>
     <string name="java_VM">Java VM</string>
+    <string name="current">current</string>
 </resources>
\ No newline at end of file