From c002096a1eb8ccfd3f6c9628d49e7f724b6dda7a Mon Sep 17 00:00:00 2001 From: Miuzarte <982809597@qq.com> Date: Tue, 14 Apr 2026 17:19:40 +0800 Subject: [PATCH] fix: double ime padding --- .../scrcpyforandroid/LockscreenPasswordActivity.kt | 4 ++++ .../miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt | 1 + .../scrcpyforandroid/pages/ReorderDevicesScreen.kt | 1 + .../scrcpyforandroid/pages/ScrcpyAllOptionsScreen.kt | 3 +++ .../miuzarte/scrcpyforandroid/scaffolds/SuperSlider.kt | 1 + .../miuzarte/scrcpyforandroid/widgets/DeviceWidgets.kt | 7 ++++--- 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/LockscreenPasswordActivity.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/LockscreenPasswordActivity.kt index 56c4cbb..6f44189 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/LockscreenPasswordActivity.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/LockscreenPasswordActivity.kt @@ -297,6 +297,7 @@ private fun LockscreenPasswordScreen( show = true, title = "当前设备未设置锁屏保护", summary = "继续使用将允许在无认证保护的情况下保存和填充锁屏密码", + defaultWindowInsetsPadding = false, onDismissRequest = activity::finish, ) { Row(horizontalArrangement = Arrangement.spacedBy(UiSpacing.ContentHorizontal)) { @@ -321,6 +322,7 @@ private fun LockscreenPasswordScreen( title = "关闭验证后密码将失去保护", summary = "关闭后每次填充密码时将不再强制认证" + "\n同时会熔断当前经认证创建的密码", + defaultWindowInsetsPadding = false, onDismissRequest = { showDisableDialog = false }, ) { Row(horizontalArrangement = Arrangement.spacedBy(UiSpacing.ContentHorizontal)) { @@ -372,6 +374,7 @@ private fun LockscreenPasswordScreen( show = true, title = "删除密码", summary = "将删除 ${target.name}", + defaultWindowInsetsPadding = false, onDismissRequest = { pendingDeleteId = null }, ) { Row(horizontalArrangement = Arrangement.spacedBy(UiSpacing.ContentHorizontal)) { @@ -582,6 +585,7 @@ private fun PasswordEditorSheet( OverlayBottomSheet( show = show, title = if (mode == PasswordDialogMode.Create) "创建新密码" else "重命名密码", + defaultWindowInsetsPadding = false, onDismissRequest = onDismissRequest, startAction = { IconButton(onClick = onDismissRequest) { diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt index 30f6b54..4dfb85b 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/DeviceTabScreen.kt @@ -1282,6 +1282,7 @@ private fun RecentTasksBottomSheet( OverlayBottomSheet( show = show, title = "最近任务", + defaultWindowInsetsPadding = false, onDismissRequest = onDismissRequest, endAction = { IconButton( diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ReorderDevicesScreen.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ReorderDevicesScreen.kt index 3ea78e0..86581ba 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ReorderDevicesScreen.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ReorderDevicesScreen.kt @@ -73,6 +73,7 @@ fun ReorderDevicesScreen( OverlayBottomSheet( show = show, title = "快速设备排序", + defaultWindowInsetsPadding = false, onDismissRequest = onDismissRequest, ) { ReorderableList( diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ScrcpyAllOptionsScreen.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ScrcpyAllOptionsScreen.kt index 06fc36f..16d7f53 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ScrcpyAllOptionsScreen.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/pages/ScrcpyAllOptionsScreen.kt @@ -1968,6 +1968,7 @@ private fun ProfileNameDialog( ProfileDialogMode.Rename -> "重命名配置" }, summary = "配置名重复时会自动追加序号", + defaultWindowInsetsPadding = false, onDismissRequest = onDismissRequest, ) { Column( @@ -2033,6 +2034,7 @@ private fun ManageProfilesSheet( OverlayBottomSheet( show = show, title = "管理配置", + defaultWindowInsetsPadding = false, onDismissRequest = onDismissRequest, endAction = { IconButton( @@ -2099,6 +2101,7 @@ private fun DeleteProfileDialog( show = true, title = "删除配置", summary = "确认删除 \"$profileName\"？", + defaultWindowInsetsPadding = false, onDismissRequest = onDismissRequest, ) { Row( diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scaffolds/SuperSlider.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scaffolds/SuperSlider.kt index 472f0ba..95f0f8f 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scaffolds/SuperSlider.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/scaffolds/SuperSlider.kt @@ -124,6 +124,7 @@ private fun SliderInputDialog( show = showDialog, title = title, summary = summary, + defaultWindowInsetsPadding = false, onDismissRequest = onDismissRequest, onDismissFinished = onDismissFinished, ) { diff --git a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/widgets/DeviceWidgets.kt b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/widgets/DeviceWidgets.kt index 1c958e8..0b00805 100644 --- a/app/src/main/java/io/github/miuzarte/scrcpyforandroid/widgets/DeviceWidgets.kt +++ b/app/src/main/java/io/github/miuzarte/scrcpyforandroid/widgets/DeviceWidgets.kt @@ -682,6 +682,7 @@ private fun PairingDialog( show = showDialog, title = "使用配对码配对设备", summary = "使用六位数的配对码配对新设备", + defaultWindowInsetsPadding = false, onDismissRequest = { onDismissRequest() }, @@ -1225,11 +1226,11 @@ internal fun QuickConnectCard( ) { Icon( Icons.Rounded.AddLink, - contentDescription = "快速连接", + contentDescription = "连接 / 添加设备", tint = colorScheme.onPrimaryContainer, ) Text( - "快速连接", + "连接 / 添加设备", fontWeight = FontWeight.Bold, color = colorScheme.onPrimaryContainer, ) @@ -1257,7 +1258,7 @@ internal fun QuickConnectCard( enabled = enabled, ) TextButton( - text = "连接", + text = "直接连接", onClick = onConnect, modifier = Modifier.weight(1f), enabled = enabled,