From 4db8eaf45c9ea03ea7f8c6885a9b8abb805f5580 Mon Sep 17 00:00:00 2001
From: FN <firenamefn@gmail.com>
Date: Sat, 9 Nov 2024 07:40:20 +0700
Subject: [PATCH] Next adaptation

---
 Content.Client/Options/UI/OptionsTabControlRow.xaml.cs       | 1 +
 Content.Client/Options/UI/Tabs/AccessibilityTab.xaml         | 5 +++--
 .../{ => _CorvaxNext}/Options/UI/OptionColorSlider.xaml      | 2 --
 .../{ => _CorvaxNext}/Options/UI/OptionColorSlider.xaml.cs   | 4 +---
 Resources/Locale/en-US/{ => _CorvaxNext}/chat/highlights.ftl | 0
 Resources/Locale/ru-RU/{ => _CorvaxNext}/chat/highlights.ftl | 0
 6 files changed, 5 insertions(+), 7 deletions(-)
 rename Content.Client/{ => _CorvaxNext}/Options/UI/OptionColorSlider.xaml (82%)
 rename Content.Client/{ => _CorvaxNext}/Options/UI/OptionColorSlider.xaml.cs (89%)
 rename Resources/Locale/en-US/{ => _CorvaxNext}/chat/highlights.ftl (100%)
 rename Resources/Locale/ru-RU/{ => _CorvaxNext}/chat/highlights.ftl (100%)

diff --git a/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs b/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs
index 197b67f2316..00b191cc60c 100644
--- a/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs
+++ b/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client._CorvaxNext.Options.UI;
 using Content.Client.Stylesheets;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
index 8746cf3a49e..9edb23d0a80 100644
--- a/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AccessibilityTab.xaml
@@ -1,6 +1,7 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:ui="clr-namespace:Content.Client.Options.UI">
+         xmlns:ui="clr-namespace:Content.Client.Options.UI"
+         xmlns:cnui="clr-namespace:Content.Client._CorvaxNext.Options.UI">
     <BoxContainer Orientation="Vertical">
         <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
             <BoxContainer Orientation="Vertical" Margin="8">
@@ -11,7 +12,7 @@
                 <ui:OptionSlider Name="ScreenShakeIntensitySlider" Title="{Loc 'ui-options-screen-shake-intensity'}" />
                 <!-- Corvax-Highlights-Start -->
                 <CheckBox Name="AutoFillHighlightsCheckBox" Text="{Loc 'ui-options-auto-fill-highlights'}" />
-                <ui:OptionColorSlider Name="HighlightsColorSlider" 
+                <cnui:OptionColorSlider Name="HighlightsColorSlider" 
                     Title="{Loc 'ui-options-highlights-color'}" 
                     Example="{Loc 'ui-options-highlights-color-example'}"/>
                 <!-- Corvax-Highlights-End -->
diff --git a/Content.Client/Options/UI/OptionColorSlider.xaml b/Content.Client/_CorvaxNext/Options/UI/OptionColorSlider.xaml
similarity index 82%
rename from Content.Client/Options/UI/OptionColorSlider.xaml
rename to Content.Client/_CorvaxNext/Options/UI/OptionColorSlider.xaml
index bb84ff5ccd3..4f5f0823506 100644
--- a/Content.Client/Options/UI/OptionColorSlider.xaml
+++ b/Content.Client/_CorvaxNext/Options/UI/OptionColorSlider.xaml
@@ -1,4 +1,3 @@
-<!-- Corvax-Highlights-Start -->
 <Control xmlns="https://spacestation14.io">
     <BoxContainer Orientation="Vertical">
         <Label Name="TitleLabel" Access="Public" />
@@ -6,4 +5,3 @@
         <ColorSelectorSliders Name="Slider" Access="Public" HorizontalExpand="True" />
     </BoxContainer>
 </Control>
-<!-- Corvax-Highlights-End -->
diff --git a/Content.Client/Options/UI/OptionColorSlider.xaml.cs b/Content.Client/_CorvaxNext/Options/UI/OptionColorSlider.xaml.cs
similarity index 89%
rename from Content.Client/Options/UI/OptionColorSlider.xaml.cs
rename to Content.Client/_CorvaxNext/Options/UI/OptionColorSlider.xaml.cs
index 71925a542fb..86356565377 100644
--- a/Content.Client/Options/UI/OptionColorSlider.xaml.cs
+++ b/Content.Client/_CorvaxNext/Options/UI/OptionColorSlider.xaml.cs
@@ -1,8 +1,7 @@
-// Corvax-Highlights-Start
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Options.UI;
+namespace Content.Client._CorvaxNext.Options.UI;
 
 /// <summary>
 /// Standard UI control used for color sliders in the options menu. Intended for use with <see cref="OptionsTabControlRow"/>.
@@ -29,4 +28,3 @@ public string? Example
         set => ExampleLabel.Text = value;
     }
 }
-// Corvax-Highlights-End
diff --git a/Resources/Locale/en-US/chat/highlights.ftl b/Resources/Locale/en-US/_CorvaxNext/chat/highlights.ftl
similarity index 100%
rename from Resources/Locale/en-US/chat/highlights.ftl
rename to Resources/Locale/en-US/_CorvaxNext/chat/highlights.ftl
diff --git a/Resources/Locale/ru-RU/chat/highlights.ftl b/Resources/Locale/ru-RU/_CorvaxNext/chat/highlights.ftl
similarity index 100%
rename from Resources/Locale/ru-RU/chat/highlights.ftl
rename to Resources/Locale/ru-RU/_CorvaxNext/chat/highlights.ftl