diff options
| author | 2023-08-12 14:39:28 -0400 | |
|---|---|---|
| committer | 2023-08-12 15:42:54 -0400 | |
| commit | 786b609151f4d80e4b9c1d4c1754c06f54b46338 (patch) | |
| tree | 7318547ed7b0aea8540222223b3f00ee697ae036 /src | |
| parent | android: Display setting value in setting list items (diff) | |
| download | yuzu-786b609151f4d80e4b9c1d4c1754c06f54b46338.tar.gz yuzu-786b609151f4d80e4b9c1d4c1754c06f54b46338.tar.xz yuzu-786b609151f4d80e4b9c1d4c1754c06f54b46338.zip | |
android: Use string resource for slider value/units
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt | 13 | ||||
| -rw-r--r-- | src/android/app/src/main/res/layout/dialog_slider.xml | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt index ce0b92c90..afde186fd 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt | |||
| @@ -207,8 +207,11 @@ class SettingsAdapter( | |||
| 207 | val sliderBinding = DialogSliderBinding.inflate(inflater) | 207 | val sliderBinding = DialogSliderBinding.inflate(inflater) |
| 208 | 208 | ||
| 209 | textSliderValue = sliderBinding.textValue | 209 | textSliderValue = sliderBinding.textValue |
| 210 | textSliderValue!!.text = sliderProgress.toString() | 210 | textSliderValue!!.text = String.format( |
| 211 | sliderBinding.textUnits.text = item.units | 211 | context.getString(R.string.value_with_units), |
| 212 | sliderProgress.toString(), | ||
| 213 | item.units | ||
| 214 | ) | ||
| 212 | 215 | ||
| 213 | sliderBinding.slider.apply { | 216 | sliderBinding.slider.apply { |
| 214 | valueFrom = item.min.toFloat() | 217 | valueFrom = item.min.toFloat() |
| @@ -216,7 +219,11 @@ class SettingsAdapter( | |||
| 216 | value = sliderProgress.toFloat() | 219 | value = sliderProgress.toFloat() |
| 217 | addOnChangeListener { _: Slider, value: Float, _: Boolean -> | 220 | addOnChangeListener { _: Slider, value: Float, _: Boolean -> |
| 218 | sliderProgress = value.toInt() | 221 | sliderProgress = value.toInt() |
| 219 | textSliderValue!!.text = sliderProgress.toString() | 222 | textSliderValue!!.text = String.format( |
| 223 | context.getString(R.string.value_with_units), | ||
| 224 | sliderProgress.toString(), | ||
| 225 | item.units | ||
| 226 | ) | ||
| 220 | } | 227 | } |
| 221 | } | 228 | } |
| 222 | 229 | ||
diff --git a/src/android/app/src/main/res/layout/dialog_slider.xml b/src/android/app/src/main/res/layout/dialog_slider.xml index 8c84cb606..d1cb31739 100644 --- a/src/android/app/src/main/res/layout/dialog_slider.xml +++ b/src/android/app/src/main/res/layout/dialog_slider.xml | |||
| @@ -5,23 +5,16 @@ | |||
| 5 | android:layout_height="wrap_content" | 5 | android:layout_height="wrap_content" |
| 6 | android:orientation="vertical"> | 6 | android:orientation="vertical"> |
| 7 | 7 | ||
| 8 | <TextView | 8 | <com.google.android.material.textview.MaterialTextView |
| 9 | android:id="@+id/text_value" | 9 | android:id="@+id/text_value" |
| 10 | style="@style/TextAppearance.Material3.LabelMedium" | ||
| 10 | android:layout_width="wrap_content" | 11 | android:layout_width="wrap_content" |
| 11 | android:layout_height="wrap_content" | 12 | android:layout_height="wrap_content" |
| 12 | android:layout_alignParentTop="true" | 13 | android:layout_alignParentTop="true" |
| 13 | android:layout_centerHorizontal="true" | 14 | android:layout_centerHorizontal="true" |
| 14 | android:layout_marginBottom="@dimen/spacing_medlarge" | 15 | android:layout_marginBottom="@dimen/spacing_medlarge" |
| 15 | android:layout_marginTop="@dimen/spacing_medlarge" | 16 | android:layout_marginTop="@dimen/spacing_medlarge" |
| 16 | tools:text="75" /> | 17 | tools:text="75%" /> |
| 17 | |||
| 18 | <TextView | ||
| 19 | android:id="@+id/text_units" | ||
| 20 | android:layout_width="wrap_content" | ||
| 21 | android:layout_height="wrap_content" | ||
| 22 | android:layout_alignTop="@+id/text_value" | ||
| 23 | android:layout_toEndOf="@+id/text_value" | ||
| 24 | tools:text="%" /> | ||
| 25 | 18 | ||
| 26 | <com.google.android.material.slider.Slider | 19 | <com.google.android.material.slider.Slider |
| 27 | android:id="@+id/slider" | 20 | android:id="@+id/slider" |