From 0a8d992a2882f86e698c3787dc9388614a2807e1 Mon Sep 17 00:00:00 2001 From: Miuzarte <982809597@qq.com> Date: Thu, 23 Apr 2026 00:08:44 +0800 Subject: [PATCH] feat: show profile name in ConfigPanel --- CHANGELOG.md | 4 ++++ .../scrcpyforandroid/pages/DeviceTabScreen.kt | 7 +++++++ .../scrcpyforandroid/scaffolds/SuperSlider.kt | 2 +- .../scrcpyforandroid/widgets/DeviceWidgets.kt | 11 +++++++++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9cd710..ba27cf8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ~~什么我居然开始写更新日志了~~ +## 0.2.2 + +- 改进: 设备页连接设备后选项卡显示当前配置名 + ## 0.2.1 - 改进: 全屏虚拟按钮更多调整选项 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 0c2c081..c9e0323 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 @@ -317,6 +317,12 @@ fun DeviceTabPage( adbSession.connectedScrcpyProfileId val connectedScrcpyBundle = resolveScrcpyBundle(connectedScrcpyProfileId) + val connectedScrcpyProfileName = remember(connectedScrcpyProfileId, scrcpyProfilesState) { + scrcpyProfilesState.profiles + .firstOrNull { it.id == connectedScrcpyProfileId } + ?.name + ?: ScrcpyOptions.GLOBAL_PROFILE_NAME + } val apps = remember(listingsRefreshVersion) { scrcpy.listings.apps } val recentTasks = remember(listingsRefreshVersion) { scrcpy.listings.recentTasks } @@ -1064,6 +1070,7 @@ fun DeviceTabPage( cameraMirroringSupported = adbSession.cameraMirroringSupported, adbConnecting = adbConnecting, isQuickConnected = isQuickConnected, + advancedEndActionText = connectedScrcpyProfileName, allAppsEndActionText = when { listingsRefreshBusy -> "..." apps.isNotEmpty() -> apps.size.toString() 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 95f0f8f..f3bf477 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 @@ -70,8 +70,8 @@ fun SuperSlider( val text = if (shouldShowUnit) "$valueText $unit" else valueText Text( text = text, - fontSize = textStyles.body2.fontSize, color = colorScheme.onSurfaceVariantActions, + fontSize = textStyles.body2.fontSize, ) }, enabled = enabled, 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 cc20444..36e5198 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 @@ -57,6 +57,7 @@ import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -416,6 +417,7 @@ internal fun ConfigPanel( cameraMirroringSupported: Boolean, adbConnecting: Boolean, isQuickConnected: Boolean, + advancedEndActionText: String, allAppsEndActionText: String, onOpenAllApps: () -> Unit, recentTasksEndActionText: String, @@ -603,6 +605,13 @@ internal fun ConfigPanel( ArrowPreference( title = if (!hideSimpleConfigItems) "更多参数" else "所有参数", summary = "所有 scrcpy 参数", + endActions = { + Text( + text = advancedEndActionText, + color = colorScheme.onSurfaceVariantActions, + fontSize = textStyles.body2.fontSize, + ) + }, onClick = onOpenAdvanced, enabled = !sessionStarted, ) @@ -614,7 +623,6 @@ internal fun ConfigPanel( text = allAppsEndActionText, color = colorScheme.onSurfaceVariantActions, fontSize = textStyles.body2.fontSize, - modifier = Modifier.padding(end = UiSpacing.ContentVertical), ) }, onClick = onOpenAllApps, @@ -627,7 +635,6 @@ internal fun ConfigPanel( text = recentTasksEndActionText, color = colorScheme.onSurfaceVariantActions, fontSize = textStyles.body2.fontSize, - modifier = Modifier.padding(end = UiSpacing.ContentVertical), ) }, onClick = onOpenRecentTasks,