Upgrade deps

Cargo.toml

@@ -24,9 +24,9 @@ polyline = "0.10.1"
 geo-types = "0.7.10"
 geoutils = "0.5.1"
 strum = { version = "0.25.0", features = ["derive"] }
-tui = { package = "ratatui", version = "0.23.0", features = ["all-widgets"]}
+tui = { package = "ratatui", version = "0.25.0", features = ["all-widgets"]}
 tui-input = "0.8.0"
 confy = "0.5.1"
 hyper-rustls = "0.24.1"
 sqlx = { version = "0.7.1", features = ["sqlx-sqlite", "sqlite", "runtime-tokio", "chrono"] }
-tui-logger = { version = "0.9.6", features = ["ratatui", "ratatui-support"] }
+tui-logger = { version = "0.10.0", features = [] }

src/component/activity_list/list.rs

@@ -58,16 +58,7 @@ pub fn activity_list_table<'a>(app: &App, activities: &'a Activities) -> Table<'
         ]));
     }
 
-    Table::new(rows)
-        .header(
-            Row::new(headers)
-                .height(1)
-                .bottom_margin(1)
-                .style(Style::default()),
-        )
-        .highlight_style(Style::default().add_modifier(Modifier::BOLD))
-        .highlight_symbol("")
-        .widths(&[
+    Table::new(rows, &[
             Constraint::Min(10),
             Constraint::Min(2),
             Constraint::Percentage(20),
@@ -78,4 +69,12 @@ pub fn activity_list_table<'a>(app: &App, activities: &'a Activities) -> Table<'
             Constraint::Percentage(10),
             Constraint::Percentage(10),
         ])
+        .header(
+            Row::new(headers)
+                .height(1)
+                .bottom_margin(1)
+                .style(Style::default()),
+        )
+        .highlight_style(Style::default().add_modifier(Modifier::BOLD))
+        .highlight_symbol("")
 }

src/component/log_view.rs

@@ -16,8 +16,7 @@ pub struct LogView {
 }
 impl LogView {
     pub(crate) fn new() -> LogView {
-        LogView {
-        }
+        LogView {}
     }
 }
 

src/component/race_predictor.rs

@@ -57,14 +57,13 @@ pub fn draw(
         ]));
     }
 
-    let table = Table::new(rows)
+    let table = Table::new(rows, &[Constraint::Length(9), Constraint::Length(10)])
         .header(
             Row::new(headers)
                 .height(1)
                 .bottom_margin(1)
                 .style(Style::default()),
-        )
-        .widths(&[Constraint::Length(9), Constraint::Length(10)]);
+        );
 
     table.render(area, f);
 }

src/component/splits.rs

@@ -61,18 +61,18 @@ pub fn draw(
             ]),
         );
     }
-    Table::new(rows)
+    Table::new(rows, &[
+            Constraint::Min(3),
+            Constraint::Percentage(33),
+            Constraint::Percentage(33),
+        ])
         .header(
             Row::new(header)
                 .height(1)
                 .bottom_margin(0)
                 .style(Style::default()),
 
-        ).widths(&[
-            Constraint::Min(3),
-            Constraint::Percentage(33),
-            Constraint::Percentage(33),
-        ])
+        )
         .highlight_style(Style::default().add_modifier(Modifier::BOLD))
         .highlight_symbol("")
         .render(area, f, &mut app.activity_view_state.pace_table_state);

src/expr/evaluator.rs

@@ -55,10 +55,10 @@ impl Evaluator {
     pub fn evaluate(&self, expr: &Expr, vars: &Vars) -> Result<bool, String> {
         match self.evaluate_expr(&expr, vars)? {
             Evalue::Number(n) => {
-                Err(format!("expression must evluate to a boolean, got {:?}: {:?}", expr, n).to_string())
+                Err(format!("expression must evaluate to a boolean, got {:?}: {:?}", expr, n).to_string())
             }
             Evalue::Date(_) | Evalue::String(_) => {
-                Err(format!("expression must evluate to a boolean, got: {:?}", expr).to_string())
+                Err(format!("expression must evaluate to a boolean, got: {:?}", expr).to_string())
             }
             Evalue::Bool(b) => Ok(b),
         }

src/expr/parser.rs

@@ -34,6 +34,10 @@ impl From<&str> for QuantityUnit {
         match value {
             "mph" => Self::Mph,
             "kmph" => Self::Kmph,
+            "m" => Self::Mph,
+            "mi" => Self::Mph,
+            "km" => Self::Kmph,
+            "k" => Self::Kmph,
             _ => Self::Kmph,
         }
     }

src/ui/mod.rs

@@ -29,6 +29,7 @@ pub fn draw(app: &mut App, f: &mut Buffer, area: Rect, view: &mut dyn View) {
         .split(area);
 
     header(app, view.mapped_events(app)).render(rows[0], f);
+
     view.draw(app, f, rows[1]);
 
     status_bar(app).render(rows[2], f);