Skip to content

Commit f145bfb

Browse files
authored
AppNavHost: Make version info text copyable (#159)
- Make version info text truly copyable. - Fix the trailing space being ignored in string resources.
1 parent af1d48e commit f145bfb

5 files changed

Lines changed: 28 additions & 11 deletions

File tree

app/src/main/java/net/rpcsx/overlay/OverlayEditActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ fun ControlPanel(
276276
Spacer(modifier = Modifier.height(5.dp))
277277

278278
Text(
279-
text = stringResource(R.string.editing) + currentButtonName,
279+
text = "${stringResource(R.string.editing)}: $currentButtonName",
280280
style = MaterialTheme.typography.titleSmall,
281281
color = MaterialTheme.colorScheme.onSurface
282282
)

app/src/main/java/net/rpcsx/ui/navigation/AppNavHost.kt

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,9 @@ fun GamesDestination(
539539
NavigationDrawerItem(
540540
label = {
541541
Text(
542-
stringResource(R.string.firmware_version) + (FirmwareRepository.version.value ?: stringResource(R.string.none))
542+
"${stringResource(R.string.firmware)}: ${
543+
FirmwareRepository.version.value ?: stringResource(R.string.none)
544+
}"
543545
)
544546
},
545547
selected = false,
@@ -641,11 +643,26 @@ fun GamesDestination(
641643
selected = false,
642644
icon = { Icon(Icons.Outlined.Info, contentDescription = null) },
643645
onClick = {
646+
val versionInfo = "UI: ${BuildConfig.Version}\nRPCSX: ${RpcsxUpdater.getCurrentVersion()}"
644647
AlertDialogQueue.showDialog(
645-
"RPCSX UI Android",
646-
"UI: ${BuildConfig.Version}\nRPCSX: ${RpcsxUpdater.getCurrentVersion()}",
648+
title = "RPCSX UI Android",
649+
message = versionInfo,
647650
confirmText = context.getString(android.R.string.copy),
648651
dismissText = context.getString(R.string.close),
652+
onConfirm = {
653+
val clipboard =
654+
context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
655+
val clip = ClipData.newPlainText(
656+
context.getString(R.string.about),
657+
versionInfo
658+
)
659+
clipboard.setPrimaryClip(clip)
660+
Toast.makeText(
661+
context,
662+
context.getString(R.string.copied_to_clipboard),
663+
Toast.LENGTH_SHORT
664+
).show()
665+
}
649666
)
650667
}
651668
)

app/src/main/java/net/rpcsx/ui/settings/SettingsScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ fun SettingsScreen(
536536
) {
537537
HomePreference(
538538
title = stringResource(R.string.users),
539-
description = stringResource(R.string.active_user) + UserRepository.getUsername(activeUser),
539+
description = "${stringResource(R.string.active_user)}: ${UserRepository.getUsername(activeUser)}",
540540
icon = {
541541
PreferenceIcon(icon = Icons.Default.Person)
542542
},

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<string name="device_info">设备信息</string>
1515
<string name="driver_download_channel">GPU 驱动程序下载渠道</string>
1616
<string name="edit_overlay">编辑虚拟按键</string>
17-
<string name="firmware_version">固件</string>
17+
<string name="firmware">固件</string>
1818
<string name="rpcsx_download_channel">RPCSX 下载渠道</string>
1919
<string name="settings">设置</string>
2020
<string name="ui_update_channel">RPCSX UI Android 更新渠道</string>
@@ -69,7 +69,7 @@
6969
<string name="ask_if_reset_button">重置 %1$s?</string>
7070
<string name="ask_if_reset_button_description">您确定要重置 %1$s 吗?</string>
7171
<string name="control_panel">控制面板</string>
72-
<string name="editing">正在编辑</string>
72+
<string name="editing">正在编辑</string>
7373
<string name="opacity">不透明度</string>
7474
<string name="scale">大小比例</string>
7575

@@ -85,7 +85,7 @@
8585
<string name="restart_ui_to_apply_change">重启 RPCSX UI 以应用更改</string>
8686

8787
<!-- SettingsScreen -->
88-
<string name="active_user">当前用户</string>
88+
<string name="active_user">当前用户</string>
8989
<string name="advanced_settings">高级设置</string>
9090
<string name="advanced_settings_description">配置模拟器高级设置</string>
9191
<string name="ask_if_reset_key">您想要将 ‘%1$s’ 重置回默认值吗?</string>

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<string name="device_info">Device Info</string>
1717
<string name="driver_download_channel">GPU Driver Download Channel</string>
1818
<string name="edit_overlay">Edit Overlay</string>
19-
<string name="firmware_version">Firmware: </string>
19+
<string name="firmware">Firmware</string>
2020
<string name="rpcsx_download_channel">RPCSX Download Channel</string>
2121
<string name="settings">Settings</string>
2222
<string name="ui_update_channel">RPCSX UI Android Update Channel</string>
@@ -71,7 +71,7 @@
7171
<string name="ask_if_reset_button">Reset %1$s?</string>
7272
<string name="ask_if_reset_button_description">Are you sure you want to reset %1$s?</string>
7373
<string name="control_panel">Control Panel</string>
74-
<string name="editing">Editing: </string>
74+
<string name="editing">Editing</string>
7575
<string name="opacity">Opacity</string>
7676
<string name="scale">Scale</string>
7777

@@ -87,7 +87,7 @@
8787
<string name="restart_ui_to_apply_change">Restart RPCSX UI to apply change</string>
8888

8989
<!-- SettingsScreen -->
90-
<string name="active_user">Active User: </string>
90+
<string name="active_user">Active User</string>
9191
<string name="advanced_settings">Advanced Settings</string>
9292
<string name="advanced_settings_description">Configure emulator advanced settings</string>
9393
<string name="ask_if_reset_key">"Do you want to reset '%1$s' to its default value?"</string>

0 commit comments

Comments
 (0)