Fixing color schemes

src/state/color_scheme.rs

@@ -0,0 +1,65 @@
+use serde::{Deserialize, Serialize};
+
+use crate::theme::ThemeColors;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Default, Serialize, Deserialize)]
+pub enum ColorScheme {
+    #[default]
+    CatppuccinMocha,
+    CatppuccinLatte,
+    Nord,
+    Dracula,
+    GruvboxDark,
+    Monokai,
+    PitchBlack,
+}
+
+impl ColorScheme {
+    pub fn label(self) -> &'static str {
+        match self {
+            Self::CatppuccinMocha => "Catppuccin Mocha",
+            Self::CatppuccinLatte => "Catppuccin Latte",
+            Self::Nord => "Nord",
+            Self::Dracula => "Dracula",
+            Self::GruvboxDark => "Gruvbox Dark",
+            Self::Monokai => "Monokai",
+            Self::PitchBlack => "Pitch Black",
+        }
+    }
+
+    pub fn next(self) -> Self {
+        match self {
+            Self::CatppuccinMocha => Self::CatppuccinLatte,
+            Self::CatppuccinLatte => Self::Nord,
+            Self::Nord => Self::Dracula,
+            Self::Dracula => Self::GruvboxDark,
+            Self::GruvboxDark => Self::Monokai,
+            Self::Monokai => Self::PitchBlack,
+            Self::PitchBlack => Self::CatppuccinMocha,
+        }
+    }
+
+    pub fn prev(self) -> Self {
+        match self {
+            Self::CatppuccinMocha => Self::PitchBlack,
+            Self::CatppuccinLatte => Self::CatppuccinMocha,
+            Self::Nord => Self::CatppuccinLatte,
+            Self::Dracula => Self::Nord,
+            Self::GruvboxDark => Self::Dracula,
+            Self::Monokai => Self::GruvboxDark,
+            Self::PitchBlack => Self::Monokai,
+        }
+    }
+
+    pub fn to_theme(self) -> ThemeColors {
+        match self {
+            Self::CatppuccinMocha => ThemeColors::catppuccin_mocha(),
+            Self::CatppuccinLatte => ThemeColors::catppuccin_latte(),
+            Self::Nord => ThemeColors::nord(),
+            Self::Dracula => ThemeColors::dracula(),
+            Self::GruvboxDark => ThemeColors::gruvbox_dark(),
+            Self::Monokai => ThemeColors::monokai(),
+            Self::PitchBlack => ThemeColors::pitch_black(),
+        }
+    }
+}

src/state/mod.rs

@@ -1,4 +1,5 @@
 pub mod audio;
+pub mod color_scheme;
 pub mod editor;
 pub mod file_browser;
 pub mod live_keys;
@@ -12,6 +13,7 @@ pub mod sample_browser;
 pub mod ui;
 
 pub use audio::{AudioSettings, DeviceKind, EngineSection, Metrics, SettingKind};
+pub use color_scheme::ColorScheme;
 pub use options::{OptionsFocus, OptionsState};
 pub use editor::{CopiedStepData, CopiedSteps, EditorContext, Focus, PatternField, PatternPropsField, StackCache};
 pub use live_keys::LiveKeyState;

src/state/options.rs

@@ -1,6 +1,7 @@
 #[derive(Clone, Copy, PartialEq, Eq, Default)]
 pub enum OptionsFocus {
     #[default]
+    ColorScheme,
     RefreshRate,
     RuntimeHighlight,
     ShowScope,
@@ -20,6 +21,7 @@ pub struct OptionsState {
 impl OptionsState {
     pub fn next_focus(&mut self) {
         self.focus = match self.focus {
+            OptionsFocus::ColorScheme => OptionsFocus::RefreshRate,
             OptionsFocus::RefreshRate => OptionsFocus::RuntimeHighlight,
             OptionsFocus::RuntimeHighlight => OptionsFocus::ShowScope,
             OptionsFocus::ShowScope => OptionsFocus::ShowSpectrum,
@@ -28,13 +30,14 @@ impl OptionsState {
             OptionsFocus::FlashBrightness => OptionsFocus::LinkEnabled,
             OptionsFocus::LinkEnabled => OptionsFocus::StartStopSync,
             OptionsFocus::StartStopSync => OptionsFocus::Quantum,
-            OptionsFocus::Quantum => OptionsFocus::RefreshRate,
+            OptionsFocus::Quantum => OptionsFocus::ColorScheme,
         };
     }
 
     pub fn prev_focus(&mut self) {
         self.focus = match self.focus {
-            OptionsFocus::RefreshRate => OptionsFocus::Quantum,
+            OptionsFocus::ColorScheme => OptionsFocus::Quantum,
+            OptionsFocus::RefreshRate => OptionsFocus::ColorScheme,
             OptionsFocus::RuntimeHighlight => OptionsFocus::RefreshRate,
             OptionsFocus::ShowScope => OptionsFocus::RuntimeHighlight,
             OptionsFocus::ShowSpectrum => OptionsFocus::ShowScope,

src/state/ui.rs

@@ -2,7 +2,7 @@ use std::time::{Duration, Instant};
 
 use cagire_ratatui::Sparkles;
 
-use crate::state::Modal;
+use crate::state::{ColorScheme, Modal};
 
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
 pub enum FlashKind {
@@ -41,6 +41,7 @@ pub struct UiState {
     pub last_event_count: usize,
     pub event_flash: f32,
     pub flash_brightness: f32,
+    pub color_scheme: ColorScheme,
 }
 
 impl Default for UiState {
@@ -67,6 +68,7 @@ impl Default for UiState {
             last_event_count: 0,
             event_flash: 0.0,
             flash_brightness: 1.0,
+            color_scheme: ColorScheme::default(),
         }
     }
 }