Merge pull request #26 from gitcoder89431/20-implement-settings-modal-ui-component

20 implement settings modal UI component

Author: gitcoder89431

src/ui/app.rs

@@ -95,17 +95,18 @@ impl App {
             let event_result = {
                 let event_handler = self.event_handler.clone();
                 tokio::task::spawn_blocking(move || event_handler.next_event())
-            }.await;
+            }
+            .await;
 
             match event_result? {
                 Ok(event) => {
                     // Only handle events that aren't None
                     if event != AppEvent::None {
                         self.handle_event(event);
-                        
+
                         // Only redraw after handling a real event
                         terminal.draw(|f| self.draw(f))?;
-                        
+
                         // Check if we should quit after handling the event
                         if self.should_quit() {
                             break;
@@ -144,38 +145,38 @@ impl App {
             }
             AppEvent::NavigateUp => {
                 // Only handle navigation in settings modal
-                if matches!(self.state, AppState::Settings) {
-                    if let Some(ref mut modal_state) = self.modal_state {
-                        modal_state.navigate_up();
-                        // Apply live theme preview
-                        let selected_theme = modal_state.selected_theme();
-                        self.theme.set_variant(selected_theme);
-                    }
+                if matches!(self.state, AppState::Settings)
+                    && let Some(ref mut modal_state) = self.modal_state
+                {
+                    modal_state.navigate_up();
+                    // Apply live theme preview
+                    let selected_theme = modal_state.selected_theme();
+                    self.theme.set_variant(selected_theme);
                 }
             }
             AppEvent::NavigateDown => {
                 // Only handle navigation in settings modal
-                if matches!(self.state, AppState::Settings) {
-                    if let Some(ref mut modal_state) = self.modal_state {
-                        modal_state.navigate_down();
-                        // Apply live theme preview
-                        let selected_theme = modal_state.selected_theme();
-                        self.theme.set_variant(selected_theme);
-                    }
+                if matches!(self.state, AppState::Settings)
+                    && let Some(ref mut modal_state) = self.modal_state
+                {
+                    modal_state.navigate_down();
+                    // Apply live theme preview
+                    let selected_theme = modal_state.selected_theme();
+                    self.theme.set_variant(selected_theme);
                 }
             }
             AppEvent::Select => {
                 // Only handle selection in settings modal
-                if matches!(self.state, AppState::Settings) {
-                    if let Some(ref modal_state) = self.modal_state {
-                        let selected_theme = modal_state.selected_theme();
-                        let action = SettingsAction::ChangeTheme(selected_theme);
-                        if let Err(e) = self.handle_settings_action(action) {
-                            self.state = AppState::Error(format!("Settings error: {}", e));
-                        }
-                        // Close modal after selection
-                        self.exit_settings();
+                if matches!(self.state, AppState::Settings)
+                    && let Some(ref modal_state) = self.modal_state
+                {
+                    let selected_theme = modal_state.selected_theme();
+                    let action = SettingsAction::ChangeTheme(selected_theme);
+                    if let Err(e) = self.handle_settings_action(action) {
+                        self.state = AppState::Error(format!("Settings error: {}", e));
                     }
+                    // Close modal after selection
+                    self.exit_settings();
                 }
             }
             AppEvent::SettingsAction(action) => {
@@ -225,10 +226,10 @@ impl App {
         self.render_footer(frame, layout_rects.footer);
 
         // Render modal overlay if in settings state
-        if matches!(self.state, AppState::Settings) {
-            if let Some(ref modal_state) = self.modal_state {
-                crate::settings::render_settings_modal(frame, size, modal_state, &self.theme);
-            }
+        if matches!(self.state, AppState::Settings)
+            && let Some(ref modal_state) = self.modal_state
+        {
+            crate::settings::render_settings_modal(frame, size, modal_state, &self.theme);
         }
     }