.cargo/config.toml

@@ -0,0 +1,2 @@
+[profile.dev.package."*"]
+opt-level = 2

.gitignore

@@ -1,3 +1 @@
-target
-.cargo/config.toml
-Cargo.lock
+/target

Cargo.toml

@@ -3,12 +3,6 @@ name = "bevy_terminal_dialog"
 version = "0.2.2"
 edition = "2021"
 
-[profile.dev]
-opt-level = 1
-
-[profile.dev.package.'*']
-opt-level = 2
-
 [dependencies]
 textwrap = "0.16"
 zalgo = "0.2"
@@ -19,7 +13,7 @@ downcast-rs = "2.0"
 lazy_static = "1.5"
 
 [dependencies.bevy_terminal_display]
-version = "0.7"
+git = "https://git.soaos.dev/soaos/bevy_terminal_display"
 
 [dependencies.bevy_basic_interaction]
 git = "https://git.soaos.dev/soaos/bevy_basic_interaction"

src/events.rs

@@ -1,6 +0,0 @@
-use bevy::prelude::*;
-use yarnspinner::runtime::DialogueOption;
-
-/// Event called when a dialog option is selected
-#[derive(Event, Debug)]
-pub struct OptionSelectedEvent(pub DialogueOption);

src/lib.rs

@@ -9,15 +9,11 @@ mod systems;
 pub mod widgets;
 pub mod util;
 
-mod events;
-pub use events::*;
-
 /// Plugin which provides dialog functionality
 pub struct TerminalDialogPlugin;
 
 impl Plugin for TerminalDialogPlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(Startup, systems::setup).add_event::<OptionSelectedEvent>();
+        app.add_systems(Startup, systems::setup);
     }
 }
-

src/util.rs

@@ -18,9 +18,10 @@ pub fn style_line(line: &yarnspinner::runtime::Line) -> Vec<(String, Style)> {
         Style::new(),
     ));
     for (i, attribute) in attributes.iter().enumerate() {
-        let mut attrib_text = line.text_for_attribute(attribute).to_string();
+        let mut attrib_text = line.text_for_attribute(&attribute).to_string();
         let mut style = Style::new();
-        if attribute.name.as_str() == "style" {
+        match attribute.name.as_str() {
+            "style" => {
                 for (property_name, property_value) in attribute.properties.iter() {
                     match property_name.as_str() {
                         "bold" => {
@@ -63,6 +64,8 @@ pub fn style_line(line: &yarnspinner::runtime::Line) -> Vec<(String, Style)> {
                     }
                 }
             }
+            _ => (),
+        }
         if attribute.name != "character" {
             line_segments.push((attrib_text, style))
         }

src/widgets.rs

@@ -5,11 +5,7 @@ use std::time::{Duration, Instant};
 use arbitrary_chunks::ArbitraryChunks as _;
 use bevy::prelude::*;
 use bevy_terminal_display::{
-    crossterm::{
-        self,
-        event::{Event, KeyCode, KeyEvent, KeyEventKind},
-    },
-    input::events::TerminalInputEvent,
+    crossterm,
     ratatui::{
         layout::{Constraint, Flex, Layout},
         style::{Style, Stylize},
@@ -24,8 +20,6 @@ use bevy_terminal_display::{
 use unicode_segmentation::UnicodeSegmentation as _;
 use yarnspinner::runtime::DialogueOption;
 
-use crate::OptionSelectedEvent;
-
 /// Dialog box widget marker
 #[derive(Component)]
 pub struct DialogBox;
@@ -51,9 +45,9 @@ impl DialogBoxWidget {
     pub fn new(character: Option<String>, text: Vec<(String, Style)>, speed: Duration) -> Self {
         Self {
             character,
-            character_count: text.iter().fold(0, |count, (string, _)| {
-                count + string.graphemes(true).count()
-            }),
+            character_count: text
+                .iter()
+                .fold(0, |count, (string, _)| count + string.graphemes(true).count()),
             text,
             speed,
             typewriter_index: 0,
@@ -68,9 +62,7 @@ impl DialogBoxWidget {
 
     /// Sets the text contained inside the dialog box
     pub fn set_text(&mut self, text: Vec<(String, Style)>) {
-        self.character_count = text.iter().fold(0, |count, (string, _)| {
-            count + string.graphemes(true).count()
-        });
+        self.character_count = text.iter().fold(0, |count, (string, _)| count + string.graphemes(true).count());
         self.text = text;
         self.typewriter_index = 0;
         self.last_character = Instant::now();
@@ -125,14 +117,13 @@ impl TerminalWidget for DialogBoxWidget {
     }
 
     fn update(&mut self, _time: &Time, _commands: &mut Commands) {
-        if self.character_count > 0
-            && self.typewriter_index < self.character_count
-            && self.last_character.elapsed() >= self.speed
-        {
+        if self.character_count > 0 && self.typewriter_index < self.character_count {
+            if self.last_character.elapsed() >= self.speed {
                 self.typewriter_index += 1;
                 self.last_character = Instant::now();
             }
         }
+    }
 }
 
 /// Option selection box widget marker
@@ -229,25 +220,4 @@ impl TerminalWidget for OptionsBoxWidget {
         frame.render_widget(Clear, area);
         frame.render_stateful_widget(list, area, &mut self.state);
     }
-
-    fn handle_events(&mut self, event: &TerminalInputEvent, commands: &mut Commands) {
-        if let TerminalInputEvent(Event::Key(KeyEvent { code, kind, .. })) = event {
-            if kind == &KeyEventKind::Press {
-                match code {
-                    KeyCode::Up => {
-                        self.state.select_previous();
-                    }
-                    KeyCode::Down => {
-                        self.state.select_next();
-                    }
-                    KeyCode::Char('e') => {
-                        commands.send_event(OptionSelectedEvent(
-                            self.options[self.state.selected().unwrap()].0.clone(),
-                        ));
-                    }
-                    _ => (),
-                }
-            }
-        }
-    }
 }