Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ fun SettingsGroupDebug() {
subtitle = {
Text(
text = if (selectedWineChannels.isNotEmpty() && selectedWineChannels.any { it.isNotBlank() })
selectedWineChannels.filter { it.isNotBlank() }.joinToString(",")
selectedWineChannels.filter { it.isNotBlank() }.joinToString(", ")
else
stringResource(R.string.settings_debug_no_channels_selected)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,31 +105,26 @@ fun SettingsGroupEmulation() {
SettingsMenuLink(
colors = settingsTileColors(),
title = { Text(text = stringResource(R.string.settings_emulation_box64_presets_title)) },
subtitle = { Text(stringResource(R.string.settings_emulation_box64_presets_subtitle)) },
onClick = { showBox64PresetsDialog = true },
)
SettingsMenuLink(
colors = settingsTileColors(),
title = { Text(text = stringResource(R.string.fexcore_presets)) },
subtitle = { Text(text = stringResource(R.string.fexcore_presets_description)) },
onClick = { showFexcorePresetsDialog = true },
)
SettingsMenuLink(
colors = settingsTileColors(),
title = { Text(text = stringResource(R.string.settings_emulation_driver_manager_title)) },
subtitle = { Text(text = stringResource(R.string.settings_emulation_driver_manager_subtitle)) },
onClick = { showDriverManager = true },
)
SettingsMenuLink(
colors = settingsTileColors(),
title = { Text(text = stringResource(R.string.settings_emulation_contents_manager_title)) },
subtitle = { Text(text = stringResource(R.string.settings_emulation_contents_manager_subtitle)) },
onClick = { showContentsManager = true },
)
SettingsMenuLink(
colors = settingsTileColors(),
title = { Text(text = stringResource(R.string.settings_emulation_wine_proton_manager_title)) },
subtitle = { Text(text = stringResource(R.string.settings_emulation_wine_proton_manager_subtitle)) },
onClick = { showWineProtonManager = true },
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ fun SettingsGroupInfo() {
colors = settingsTileColorsAlt(),
state = askForTip,
title = { Text(stringResource(R.string.settings_info_ask_tip_title)) },
subtitle = { Text(text = stringResource(R.string.settings_info_ask_tip_subtitle)) },
onCheckedChange = {
askForTip = it
PrefManager.tipped = !askForTip
Expand All @@ -59,21 +58,18 @@ fun SettingsGroupInfo() {
SettingsMenuLink(
colors = settingsTileColors(),
title = { Text(text = stringResource(R.string.settings_info_source_title)) },
subtitle = { Text(text = stringResource(R.string.settings_info_source_subtitle)) },
onClick = { uriHandler.openUri(Constants.Misc.GITHUB_LINK) },
)

SettingsMenuLink(
colors = settingsTileColors(),
title = { Text(text = stringResource(R.string.settings_info_libraries_title)) },
subtitle = { Text(text = stringResource(R.string.settings_info_libraries_subtitle)) },
onClick = { showLibrariesDialog = true },
)

SettingsMenuLink(
colors = settingsTileColors(),
title = { Text(text = stringResource(R.string.settings_info_privacy_title)) },
subtitle = { Text(text = stringResource(R.string.settings_info_privacy_subtitle)) },
onClick = {
uriHandler.openUri(Constants.Misc.PRIVACY_LINK)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ fun SettingsGroupInterface(
SettingsSwitch(
colors = settingsTileColorsAlt(),
title = { Text(text = stringResource(R.string.settings_interface_external_links_title)) },
subtitle = { Text(text = stringResource(R.string.settings_interface_external_links_subtitle)) },
state = openWebLinks,
onCheckedChange = {
openWebLinks = it
Expand Down Expand Up @@ -383,6 +382,16 @@ fun SettingsGroupInterface(
}
}

// Steam download server selection
SettingsMenuLink(
colors = settingsTileColorsAlt(),
title = { Text(text = stringResource(R.string.settings_interface_download_server_title)) },
subtitle = {
Text(text = steamRegionsList.getOrNull(selectedRegionIndex)?.second ?: stringResource(R.string.settings_region_default))
},
onClick = { openRegionDialog = true },
)

val ctx = LocalContext.current
val sm = ctx.getSystemService(StorageManager::class.java)

Expand Down Expand Up @@ -439,15 +448,6 @@ fun SettingsGroupInterface(
colors = settingsTileColorsAlt(),
)
}
// Steam download server selection
SettingsMenuLink(
colors = settingsTileColorsAlt(),
title = { Text(text = stringResource(R.string.settings_interface_download_server_title)) },
subtitle = {
Text(text = steamRegionsList.getOrNull(selectedRegionIndex)?.second ?: stringResource(R.string.settings_region_default))
},
onClick = { openRegionDialog = true },
)
}

// Steam Download Server choice dialog
Expand Down Expand Up @@ -653,4 +653,3 @@ private fun Preview_SettingsScreen() {
)
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import androidx.compose.material.icons.filled.BugReport
import androidx.compose.material.icons.filled.Gamepad
import androidx.compose.material.icons.filled.Info
import androidx.compose.material.icons.filled.Palette
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -190,36 +189,6 @@ private fun SettingsHeader(
),
color = MaterialTheme.colorScheme.onSurface,
)
Text(
text = stringResource(R.string.settings_subtitle),
style = MaterialTheme.typography.bodySmall,
color = PluviaTheme.colors.textMuted,
)
}

Spacer(modifier = Modifier.weight(1f))

// Settings icon decoration
Box(
modifier = Modifier
.size(48.dp)
.clip(CircleShape)
.background(
Brush.radialGradient(
colors = listOf(
PluviaTheme.colors.accentCyan.copy(alpha = 0.2f),
Color.Transparent,
),
),
),
contentAlignment = Alignment.Center,
) {
Icon(
imageVector = Icons.Default.Settings,
contentDescription = null,
tint = PluviaTheme.colors.accentCyan.copy(alpha = 0.6f),
modifier = Modifier.size(24.dp),
)
}
}
}
Expand Down
29 changes: 9 additions & 20 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@
<string name="toast_failed_log_save">Failed to save logcat to destination</string>

<!-- Settings -->
<string name="settings_save_logcat_subtitle">Saves a snapshot of the logcat only for this app\'s PID</string>
<string name="settings_save_logcat_subtitle">Saves a logcat snapshot only for this app\'s PID</string>
<string name="settings_save_logcat_title">Save logcat</string>

<string name="box86_64_env_var_help__dynarec_safeflags"><![CDATA[
Expand Down Expand Up @@ -696,7 +696,6 @@
<string name="box64_preset">Box64 Preset</string>
<string name="box64_presets">Box64 Presets</string>
<string name="fexcore_presets">FEXCore Presets</string>
<string name="fexcore_presets_description">View, modify, and create FEXCore presets</string>
<string name="preset_name">Preset name</string>

<!-- Container Configuration: Input -->
Expand Down Expand Up @@ -780,7 +779,7 @@

<!-- Dialogs -->
<string name="allowed_orientations">Allowed Orientations</string>
<string name="select_wine_debug_channels">Select Wine Debug Channels</string>
<string name="select_wine_debug_channels">Wine Debug Channels</string>
<string name="cpu_label">CPU%d</string>
<string name="describe_what_happened">Describe what happened</string>
<string name="get_support_on_discord">Get support on Discord</string>
Expand Down Expand Up @@ -814,20 +813,16 @@
<!-- Settings: Emulation Group -->
<string name="settings_emulation_title">Emulation</string>
<string name="settings_emulation_orientations_title">Allowed Orientations</string>
<string name="settings_emulation_orientations_subtitle">Choose which orientations can be rotated to when in-game</string>
<string name="settings_emulation_orientations_subtitle">Choose which orientations can be used in-game</string>
<string name="settings_emulation_default_config_title">Modify Default Config</string>
<string name="settings_emulation_default_config_subtitle">The initial container settings for each game (does not affect already installed games)</string>
<string name="settings_emulation_default_config_subtitle">Initial container settings for newly installed games</string>
<string name="settings_emulation_default_config_dialog_title">Default Container Config</string>
<string name="settings_emulation_auto_apply_known_config_title">Auto-apply known config</string>
<string name="settings_emulation_auto_apply_known_config_subtitle">Automatically apply recommended settings for Steam games on first launch</string>
<string name="settings_emulation_auto_apply_known_config_subtitle">Automatically apply recommended game settings on first launch</string>
<string name="settings_emulation_box64_presets_title">Box64 Presets</string>
<string name="settings_emulation_box64_presets_subtitle">View, modify, and create Box64 presets</string>
<string name="settings_emulation_driver_manager_title">Driver Manager</string>
<string name="settings_emulation_driver_manager_subtitle">Install or remove custom graphics driver packages</string>
<string name="settings_emulation_contents_manager_title">Contents Manager</string>
<string name="settings_emulation_contents_manager_subtitle">Install additional components (.wcp)</string>
<string name="settings_emulation_wine_proton_manager_title">Wine/Proton Manager</string>
<string name="settings_emulation_wine_proton_manager_subtitle">Import custom Wine/Proton versions (Bionic only)</string>
<string name="settings_emulation_wine_proton_manager_title">Custom Wine/Proton versions</string>

<!-- Settings: Debug Group -->
<string name="settings_debug_title">Debug</string>
Expand Down Expand Up @@ -855,23 +850,18 @@
<string name="settings_info_send_tip_title">Send tip</string>
<string name="settings_info_send_tip_subtitle">Contribute to ongoing development</string>
<string name="settings_info_ask_tip_title">Ask for tip on startup</string>
<string name="settings_info_ask_tip_subtitle">Stops the tip message from appearing</string>
<string name="settings_info_source_title">Source code</string>
<string name="settings_info_source_subtitle">View the source code of this project</string>
<string name="settings_info_libraries_title">Libraries Used</string>
<string name="settings_info_libraries_subtitle">See what technologies make GameNative possible</string>
<string name="settings_info_privacy_title">Privacy Policy</string>
<string name="settings_info_privacy_subtitle">Opens a link to GameNative\'s privacy policy</string>

<!-- Settings: Interface Group -->
<string name="settings_interface_title">Interface</string>
<string name="settings_interface_external_links_title">Open web links externally</string>
<string name="settings_interface_external_links_subtitle">Links open with your main web browser</string>
<string name="settings_interface_external_links_title">Open links in external browser</string>
<string name="settings_interface_hide_statusbar_title">Hide status bar when not in game</string>
<string name="settings_interface_hide_statusbar_subtitle">Hide Android status bar in game list, settings, etc. App will restart when changed.</string>
<string name="settings_interface_hide_statusbar_subtitle">Hide Android status bar in game list, settings, etc. Restart required.</string>
<string name="settings_interface_swap_face_buttons_title">Swap face buttons</string>
<string name="settings_interface_swap_face_buttons_subtitle">Swap A↔B and X↔Y button icons</string>
<string name="settings_interface_icon_style">Icon style</string>
<string name="settings_interface_icon_style">App icon style</string>
<string name="settings_interface_wifi_only_title">Download only over Wi-Fi/LAN</string>
<string name="settings_interface_wifi_only_subtitle">Prevent downloads on cellular data</string>
<string name="settings_interface_external_storage_title">Write to external storage</string>
Expand Down Expand Up @@ -1242,7 +1232,6 @@

<!-- Settings Screen -->
<string name="settings_title">Settings</string>
<string name="settings_subtitle">Customize your experience</string>

<!-- Contents Install Finish -->
<string name="contents_install_success">Content installed successfully</string>
Expand Down