From 3d0aa42d7d46f5487b52dcc331afe30437de25c2 Mon Sep 17 00:00:00 2001
From: GarandPLG <garandplg@garandplg.com>
Date: Sat, 14 Mar 2026 20:13:41 +0100
Subject: [PATCH] Adopt clap::ValueEnum for Group and tidy menu view
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Derive `ValueEnum` for `Group` and remove its custom `iter` method.
- Update keybindings widget to use `Group::value_variants()` and adjust
  containment and filtering logic.
- Replace view option generation with a `format_view_string` helper that
  inserts a space before the second capital letter, eliminating the
  previous filter for “MAIN MENU”.
- Adjust imports to include `clap::ValueEnum` where needed.
---
 src/app/keybindings/keybindings.rs | 11 ++------
 src/app/views/main_menu.rs         | 43 +++++++++++++++---------------
 src/app/widgets/keybindings.rs     |  7 ++---
 3 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/app/keybindings/keybindings.rs b/src/app/keybindings/keybindings.rs
index 46391c6..0c80e32 100644
--- a/src/app/keybindings/keybindings.rs
+++ b/src/app/keybindings/keybindings.rs
@@ -1,3 +1,4 @@
+use clap::ValueEnum;
 use ratatui::crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -11,21 +12,13 @@ pub enum Action {
     Esc,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, ValueEnum)]
 pub enum Group {
     Movement,
     Select,
     Quit,
 }
 
-impl Group {
-    pub fn iter() -> impl Iterator<Item = Group> {
-        [Group::Movement, Group::Select, Group::Quit]
-            .iter()
-            .copied()
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct KeyBinding {
     pub action: Action,
diff --git a/src/app/views/main_menu.rs b/src/app/views/main_menu.rs
index 64419cc..df349c7 100644
--- a/src/app/views/main_menu.rs
+++ b/src/app/views/main_menu.rs
@@ -12,22 +12,18 @@ use ratatui::{
     widgets::{Block, Borders, Paragraph, Widget},
 };
 
-fn view_options() -> Vec<(usize, String)> {
-    View::value_variants()
-        .iter()
-        .enumerate()
-        .filter_map(|(i, v)| {
-            v.to_possible_value().map(|possible_value| {
-                let name = possible_value
-                    .get_name()
-                    .replace('-', " ")
-                    .to_uppercase()
-                    .to_string();
-                (i, name)
-            })
-        })
-        .filter(|(_, v)| v != "MAIN MENU")
-        .collect()
+fn format_view_string(s: String) -> String {
+    if let Some(pos) = s
+        .char_indices()
+        .filter(|(_, c)| c.is_ascii_uppercase())
+        .nth(1)
+        .map(|(i, _)| i)
+    {
+        let (first, second) = s.split_at(pos);
+        format!("{first} {second}")
+    } else {
+        s
+    }
 }
 
 pub fn main_menu_view(app: &App, area: Rect, buf: &mut Buffer) {
@@ -66,14 +62,19 @@ pub fn main_menu_view(app: &App, area: Rect, buf: &mut Buffer) {
     {
         let options_area: Rect = main_menu_areas[1];
 
-        let lines: Vec<Line<'_>> = view_options()
-            .into_iter()
+        let lines: Vec<Line<'_>> = View::value_variants()
+            .iter()
+            .enumerate()
+            .filter(|(_, v)| v != &&View::MainMenu)
             .map(|(i, view)| {
-                let styled = if app.game_states.main_menu_state.selected_view == i {
-                    Line::from(format!("> {}", view)).yellow()
+                let view_string: String = format_view_string(format!("{:?}", view));
+
+                let styled: Line<'_> = if app.game_states.main_menu_state.selected_view == i {
+                    Line::from(format!("> {view_string}")).yellow()
                 } else {
-                    Line::from(view).white()
+                    Line::from(view_string).white()
                 };
+
                 styled
             })
             .collect();
diff --git a/src/app/widgets/keybindings.rs b/src/app/widgets/keybindings.rs
index 3f74db8..83917ac 100644
--- a/src/app/widgets/keybindings.rs
+++ b/src/app/widgets/keybindings.rs
@@ -1,6 +1,7 @@
 use std::collections::HashSet;
 
 use crate::app::keybindings::{Group, KeyBinding};
+use clap::ValueEnum;
 use ratatui::{
     buffer::Buffer,
     layout::{Alignment, Constraint, Layout, Rect},
@@ -21,14 +22,14 @@ impl KeybindingsWidget {
             .collect();
 
         let mut grouped_keybindings: Vec<Paragraph<'static>> = Vec::new();
-        for (i, group) in Group::iter().enumerate() {
-            if !used_groups.contains(&group) {
+        for (i, group) in Group::value_variants().iter().enumerate() {
+            if !used_groups.contains(group) {
                 continue;
             }
 
             let grouped_lines: Vec<Line<'_>> = keybindings
                 .iter()
-                .filter(|b| b.as_ref().map_or(false, |kb| kb.group == group))
+                .filter(|b| b.as_ref().map_or(false, |kb| kb.group == *group))
                 .filter_map(|b| {
                     b.as_ref().map(|kb| {
                         Line::from_iter([