From 96c803f31e767bcb3683065ce02e3492cb860f24 Mon Sep 17 00:00:00 2001 From: Nedifinita Date: Tue, 15 Jul 2025 14:52:14 +0800 Subject: [PATCH] fix: resolve R8 compilation issues and deprecated UI components --- app/proguard-rules.pro | 8 +++++++- .../noxylva/lbjconsole/ui/components/TrainDetailDialog.kt | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index ceae6c8..615c40f 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -12,5 +12,11 @@ -keep class androidx.compose.** { *; } -keep class kotlin.** { *; } +-keep class org.xmlpull.** { *; } +-keep class org.kxml2.** { *; } +-keep class android.content.res.XmlResourceParser { *; } + -dontwarn org.osmdroid.** --dontwarn org.mapsforge.** \ No newline at end of file +-dontwarn org.mapsforge.** +-dontwarn org.xmlpull.** +-dontwarn org.kxml2.** \ No newline at end of file diff --git a/app/src/main/java/org/noxylva/lbjconsole/ui/components/TrainDetailDialog.kt b/app/src/main/java/org/noxylva/lbjconsole/ui/components/TrainDetailDialog.kt index 6334217..98805e2 100644 --- a/app/src/main/java/org/noxylva/lbjconsole/ui/components/TrainDetailDialog.kt +++ b/app/src/main/java/org/noxylva/lbjconsole/ui/components/TrainDetailDialog.kt @@ -62,20 +62,20 @@ fun TrainDetailDialog( DetailItem("方向", recordMap["direction"] ?: "未知") } - Divider(modifier = Modifier.padding(vertical = 8.dp)) + HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) DetailItem("接收时间", recordMap["timestamp"] ?: "--") DetailItem("列车时间", recordMap["time"] ?: "--") - Divider(modifier = Modifier.padding(vertical = 8.dp)) + HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) DetailItem("速度", recordMap["speed"] ?: "--") DetailItem("位置", recordMap["position"] ?: "--") DetailItem("位置信息", recordMap["position_info"] ?: "--") - Divider(modifier = Modifier.padding(vertical = 8.dp)) + HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) DetailItem("机车号", recordMap["loco"] ?: "--") @@ -89,7 +89,7 @@ fun TrainDetailDialog( DetailItem("信号强度", recordMap["rssi"] ?: "--") if (coordinates != null) { - Divider(modifier = Modifier.padding(vertical = 8.dp)) + HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp)) DetailItem( label = "经纬度",