Skip to content

Commit f521e4c

Browse files
committed
Settings: mark edited setting with '*' suffix
1 parent 964dc8a commit f521e4c

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,10 @@ fun AdvancedSettingsScreen(
108108

109109
"bool" -> {
110110
var itemValue by remember { mutableStateOf(itemObject.getBoolean("value")) }
111+
val def = itemObject.getBoolean("default")
111112
SwitchPreference (
112113
checked = itemValue,
113-
title = key,
114+
title = key + if (itemValue == def) "" else " *",
114115
leadingIcon = null
115116
) { value ->
116117
if (!RPCS3.instance.settingsSet(itemPath, if (value) "true" else "false")) {
@@ -124,6 +125,7 @@ fun AdvancedSettingsScreen(
124125

125126
"enum" -> {
126127
var itemValue by remember { mutableStateOf(itemObject.getString("value")) }
128+
val def = itemObject.getString("default")
127129
val variantsJson = itemObject.getJSONArray("variants")
128130
val variants = ArrayList<String>()
129131
for (i in 0..<variantsJson.length()) {
@@ -134,7 +136,7 @@ fun AdvancedSettingsScreen(
134136
currentValue = if (itemValue in variants) itemValue else variants[0],
135137
values = variants,
136138
icon = null,
137-
title = key,
139+
title = key + if (itemValue == def) "" else " *",
138140
onValueChange = {
139141
value ->
140142
if (!RPCS3.instance.settingsSet(itemPath, "\"" + value + "\"")) {
@@ -149,11 +151,13 @@ fun AdvancedSettingsScreen(
149151
"uint", "int" -> {
150152
var max = 0L
151153
var min = 0L
152-
var initialItemValue = 0L;
154+
var initialItemValue = 0L
155+
var def = 0L
153156
try {
154157
initialItemValue = itemObject.getString("value").toLong()
155158
max = itemObject.getString("max").toLong()
156159
min = itemObject.getString("min").toLong()
160+
def = itemObject.getString("default").toLong()
157161
} catch (e: Exception) {
158162
e.printStackTrace()
159163
}
@@ -162,7 +166,7 @@ fun AdvancedSettingsScreen(
162166
SliderPreference(
163167
value = itemValue.toFloat(),
164168
valueRange = min.toFloat()..max.toFloat(),
165-
title = key,
169+
title = key + if (itemValue == def) "" else " *",
166170
steps = (max - min).toInt(),
167171
onValueChange = { value ->
168172
if (!RPCS3.instance.settingsSet(
@@ -191,12 +195,13 @@ fun AdvancedSettingsScreen(
191195
var itemValue by remember { mutableDoubleStateOf(itemObject.getString("value").toDouble()) }
192196
val max = if (itemObject.has("max")) itemObject.getString("max").toDouble() else 0.0
193197
val min = if (itemObject.has("min")) itemObject.getString("min").toDouble() else 0.0
198+
val def = if (itemObject.has("default")) itemObject.getString("default").toDouble() else 0.0
194199

195200
if (min < max && max - min < 1000) {
196201
SliderPreference(
197202
value = itemValue.toFloat(),
198203
valueRange = min.toFloat()..max.toFloat(),
199-
title = key,
204+
title = key + if (itemValue == def) "" else " *",
200205
steps = (max - min + 1).toInt(),
201206
onValueChange = { value ->
202207
if (!RPCS3.instance.settingsSet(
@@ -213,7 +218,7 @@ fun AdvancedSettingsScreen(
213218
itemValue = value.toDouble()
214219
}
215220
},
216-
valueContent = { Text(itemValue.toString()) }
221+
valueContent = { Text(itemValue.toString() ) }
217222
)
218223
}
219224
}

0 commit comments

Comments
 (0)