Skip to content
This repository was archived by the owner on Apr 9, 2025. It is now read-only.

Commit 89a78de

Browse files
committed
Settings: show all range options
1 parent d7f33b0 commit 89a78de

File tree

2 files changed

+33
-19
lines changed

2 files changed

+33
-19
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import android.net.Uri
77
import android.provider.DocumentsContract
88
import android.util.Log
99
import android.widget.Toast
10-
import androidx.documentfile.provider.DocumentFile
1110
import androidx.activity.compose.rememberLauncherForActivityResult
1211
import androidx.activity.result.contract.ActivityResultContracts
1312
import androidx.compose.foundation.layout.Spacer
@@ -17,8 +16,8 @@ import androidx.compose.foundation.layout.padding
1716
import androidx.compose.foundation.lazy.LazyColumn
1817
import androidx.compose.material.icons.Icons
1918
import androidx.compose.material.icons.automirrored.filled.KeyboardArrowLeft
20-
import androidx.compose.material.icons.filled.Share
2119
import androidx.compose.material.icons.filled.Settings
20+
import androidx.compose.material.icons.filled.Share
2221
import androidx.compose.material.icons.outlined.Build
2322
import androidx.compose.material3.ExperimentalMaterial3Api
2423
import androidx.compose.material3.Icon
@@ -41,6 +40,7 @@ import androidx.compose.ui.res.painterResource
4140
import androidx.compose.ui.text.font.FontWeight
4241
import androidx.compose.ui.tooling.preview.Preview
4342
import androidx.compose.ui.unit.dp
43+
import androidx.documentfile.provider.DocumentFile
4444
import net.rpcs3.R
4545
import net.rpcs3.RPCS3
4646
import net.rpcs3.dialogs.AlertDialogQueue
@@ -196,7 +196,7 @@ fun AdvancedSettingsScreen(
196196
e.printStackTrace()
197197
}
198198
var itemValue by remember { mutableLongStateOf(initialItemValue) }
199-
if (min < max && max - min < 1000) {
199+
if (min < max) {
200200
SliderPreference(
201201
value = itemValue.toFloat(),
202202
valueRange = min.toFloat()..max.toFloat(),
@@ -245,7 +245,7 @@ fun AdvancedSettingsScreen(
245245
val min = if (itemObject.has("min")) itemObject.getString("min").toDouble() else 0.0
246246
val def = if (itemObject.has("default")) itemObject.getString("default").toDouble() else 0.0
247247

248-
if (min < max && max - min < 1000) {
248+
if (min < max) {
249249
SliderPreference(
250250
value = itemValue.toFloat(),
251251
valueRange = min.toFloat()..max.toFloat(),

app/src/main/java/net/rpcs3/ui/settings/components/preference/SliderPreference.kt

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
package net.rpcs3.ui.settings.components.preference
22

3+
import androidx.compose.foundation.layout.Arrangement
4+
import androidx.compose.foundation.layout.Column
5+
import androidx.compose.foundation.text.KeyboardOptions
36
import androidx.compose.material.icons.Icons
47
import androidx.compose.material.icons.filled.Refresh
5-
import androidx.compose.foundation.layout.*
6-
import androidx.compose.foundation.text.KeyboardOptions
7-
import androidx.compose.material3.*
8-
import androidx.compose.runtime.*
8+
import androidx.compose.material3.AlertDialog
9+
import androidx.compose.material3.OutlinedTextField
10+
import androidx.compose.material3.Slider
11+
import androidx.compose.material3.SliderColors
12+
import androidx.compose.material3.SliderDefaults
13+
import androidx.compose.material3.Text
14+
import androidx.compose.material3.TextButton
15+
import androidx.compose.runtime.Composable
16+
import androidx.compose.runtime.getValue
17+
import androidx.compose.runtime.mutableFloatStateOf
18+
import androidx.compose.runtime.mutableStateOf
19+
import androidx.compose.runtime.remember
20+
import androidx.compose.runtime.setValue
921
import androidx.compose.ui.Modifier
1022
import androidx.compose.ui.graphics.vector.ImageVector
11-
import androidx.compose.ui.tooling.preview.PreviewLightDark
1223
import androidx.compose.ui.text.input.KeyboardType
24+
import androidx.compose.ui.tooling.preview.PreviewLightDark
1325
import androidx.compose.ui.unit.dp
1426
import net.rpcs3.ui.common.ComposePreview
1527
import net.rpcs3.ui.settings.components.core.PreferenceIcon
@@ -91,16 +103,18 @@ fun SliderPreference(
91103
}
92104
)
93105

94-
Slider(
95-
value = tempValue,
96-
onValueChange = { newValue ->
97-
tempValue = newValue
98-
textValue = newValue.toInt().toString()
99-
},
100-
valueRange = valueRange,
101-
steps = steps,
102-
colors = sliderColors
103-
)
106+
if ((valueRange.endInclusive - valueRange.start) < 1000) {
107+
Slider(
108+
value = tempValue,
109+
onValueChange = { newValue ->
110+
tempValue = newValue
111+
textValue = newValue.toInt().toString()
112+
},
113+
valueRange = valueRange,
114+
steps = steps,
115+
colors = sliderColors
116+
)
117+
}
104118
}
105119
},
106120
confirmButton = {

0 commit comments

Comments
 (0)