From 4fc25d1cef5cbd6b2a755e94622e4f5a1322142c Mon Sep 17 00:00:00 2001
From: user <user@example.com>
Date: Wed, 8 Jul 2026 20:49:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=85=A5=E5=8F=A3=E6=94=B9=E4=B8=BA=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=A0=8F=E5=9B=BE=E6=A0=87=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=A2=84=E6=B5=8B=E6=80=A7=E8=BF=94=E5=9B=9E=E6=89=8B=E5=8A=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除首页底部的历史记录卡片组件 (historyCard)
在右上角工具栏悬浮窗与搜索图标之间添加历史图标按钮
新增 ic_history.xml 矢量图标资源
启用 Android 14+ 预测性返回手势 (enableOnBackInvokedCallback)
更新 appcompat 至 1.7.0，移除冗余旧版本依赖
调整 disconnectButton 布局约束
---
 app/build.gradle.kts                          |  8 +--
 app/src/main/AndroidManifest.xml              |  3 +-
 .../ui/main/MainActivity.kt                   |  2 +-
 app/src/main/res/drawable/ic_history.xml      |  9 +++
 app/src/main/res/layout/activity_main.xml     | 59 ++++---------------
 5 files changed, 27 insertions(+), 54 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_history.xml

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 027c625..0299aca 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -22,8 +22,8 @@ android {
         applicationId = "com.example.heart_rate_monitor_mobile"
         minSdk = 27
         targetSdk = 35
-        versionCode = 5
-        versionName = "1.7"
+        versionCode = 6
+        versionName = "1.8"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         signingConfig = signingConfigs.getByName("release")
@@ -92,8 +92,7 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
 
-    implementation("androidx.core:core-ktx:1.13.1")
-    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.appcompat:appcompat:1.7.0")
     implementation("com.google.android.material:material:1.12.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
 
@@ -101,7 +100,6 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0")
     implementation("androidx.lifecycle:lifecycle-process:2.7.0")
-    implementation("androidx.activity:activity-ktx:1.9.0")
 
     // Kable for Bluetooth LE
     implementation("com.juul.kable:core-android:0.32.0")
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8473ff2..0a7860b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,13 +29,14 @@
         android:name=".HeartRateApp"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.HeartRateMonitorMobile"
-        tools:targetApi="31">
+        tools:targetApi="35">
 
         <service
             android:name=".service.BleService"
diff --git a/app/src/main/java/com/example/heart_rate_monitor_mobile/ui/main/MainActivity.kt b/app/src/main/java/com/example/heart_rate_monitor_mobile/ui/main/MainActivity.kt
index a27e9a3..b02bcb9 100644
--- a/app/src/main/java/com/example/heart_rate_monitor_mobile/ui/main/MainActivity.kt
+++ b/app/src/main/java/com/example/heart_rate_monitor_mobile/ui/main/MainActivity.kt
@@ -213,7 +213,7 @@ class MainActivity : BaseActivity() {
         binding.scanButton.setOnClickListener { viewModel.startScan() }
         binding.disconnectButton.setOnClickListener { viewModel.disconnectDevice() }
         binding.floatingWindowButton.setOnClickListener { toggleFloatingWindow() }
-        binding.historyCard.setOnClickListener {
+        binding.historyButton.setOnClickListener {
             startActivity(Intent(this, HistoryActivity::class.java))
         }
         binding.bottomNavigation.setOnItemSelectedListener { item ->
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
new file mode 100644
index 0000000..22e3007
--- /dev/null
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M13,3a9,9 0 0 0 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42A8.954,8.954 0 0 0 13,21a9,9 0 0 0 0,-18zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 504d2d4..6f88dac 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -40,6 +40,17 @@
                     app:srcCompat="@drawable/ic_floating_window_off"
                     app:tint="@android:color/white" />
 
+                <ImageButton
+                    android:id="@+id/historyButton"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="查看历史记录"
+                    android:padding="12dp"
+                    android:scaleType="fitCenter"
+                    android:src="@drawable/ic_history"
+                    app:tint="?attr/colorOnSurface" />
+
                 <ImageButton
                     android:id="@+id/scanButton"
                     android:layout_width="48dp"
@@ -245,52 +256,6 @@
                 tools:itemCount="3"
                 tools:listitem="@layout/list_item_device" />
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/historyCard"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginBottom="16dp"
-                android:clickable="true"
-                android:focusable="true"
-                android:foreground="?attr/selectableItemBackground"
-                app:cardBackgroundColor="?attr/colorSurface"
-                app:cardCornerRadius="12dp"
-                app:cardElevation="4dp"
-                app:cardUseCompatPadding="true"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/devicesRecyclerView"
-                app:layout_constraintVertical_bias="0.0">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:paddingHorizontal="16dp">
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_info"
-                        app:tint="?attr/colorPrimary" />
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_weight="1"
-                        android:text="查看历史记录"
-                        android:textColor="?attr/colorOnSurface"
-                        android:textSize="16sp" />
-
-                    <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:src="@drawable/ic_arrow_forward"
-                        app:tint="?attr/colorOnSurfaceVariant" />
-                </LinearLayout>
-            </androidx.cardview.widget.CardView>
-
             <Button
                 android:id="@+id/disconnectButton"
                 android:layout_width="wrap_content"
@@ -305,7 +270,7 @@
                 app:icon="@drawable/ic_bluetooth_disabled"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/historyCard" />
+                app:layout_constraintTop_toBottomOf="@+id/devicesRecyclerView" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>