Завершить инженерный кандидат Stage 5

app/src/main/java/com/projectsacrifice/game/GameStrings.java

@@ -79,6 +79,15 @@ public final class GameStrings {
     public String highContrastValue(boolean enabled) {
         return hapticsValue(enabled);
     }
+    public String reducedMotionSetting() { return russian() ? "Меньше движения" : "Reduced motion"; }
+    public String reducedMotionValue(boolean enabled) { return hapticsValue(enabled); }
+    public String audioTitle() { return russian() ? "ЗВУК" : "Audio"; }
+    public String musicSetting() { return russian() ? "Музыка" : "Music"; }
+    public String effectsSetting() { return russian() ? "Эффекты" : "Effects"; }
+    public String voiceSetting() { return russian() ? "Голоса" : "Voice"; }
+    public String volumeValue(AudioSettings settings, int preset) {
+        return settings.volumeLabel(preset);
+    }
     public String back() { return russian() ? "Назад" : "Back"; }
 
     public String hudStats(int deaths, long elapsedMilliseconds) {
@@ -222,6 +231,12 @@ public final class GameStrings {
 
     public String settingsDescription(ControlSettings controls,
                                       AccessibilitySettings accessibility) {
+        return settingsDescription(controls, accessibility, AudioSettings.defaults());
+    }
+
+    public String settingsDescription(ControlSettings controls,
+                                      AccessibilitySettings accessibility,
+                                      AudioSettings audio) {
         if (russian()) {
             return "Настройки. Размер управления "
                     + controlSizeValue(controls.controlSizeIndex())
@@ -230,6 +245,11 @@ public final class GameStrings {
                     + ". Вибрация " + hapticsValue(controls.hapticsEnabled())
                     + ". Размер текста " + textSizeValue(accessibility.textScale())
                     + ". Контраст " + highContrastValue(accessibility.highContrastEnabled())
+                    + ". Меньше движения "
+                    + reducedMotionValue(accessibility.reducedMotionEnabled())
+                    + ". Музыка " + volumeValue(audio, audio.musicPreset())
+                    + ". Эффекты " + volumeValue(audio, audio.effectsPreset())
+                    + ". Голоса " + volumeValue(audio, audio.voicePreset())
                     + ". Назад.";
         }
         return "Settings. Control size " + controls.controlSizeLabel()
@@ -237,6 +257,10 @@ public final class GameStrings {
                 + ". Vibration " + controls.hapticsLabel()
                 + ". Text size " + accessibility.textSizeLabel()
                 + ". High contrast " + accessibility.highContrastLabel()
+                + ". Reduced motion " + accessibility.reducedMotionLabel()
+                + ". Music " + volumeValue(audio, audio.musicPreset())
+                + ". Effects " + volumeValue(audio, audio.effectsPreset())
+                + ". Voice " + volumeValue(audio, audio.voicePreset())
                 + ". Back.";
     }