Support showing elapsed/moving time

Author: dantleech

README.md

@@ -28,8 +28,8 @@ Features:
 - `q`: **Quit**: quit!
 - `k`: **Up** - select previous activity
 - `j`: **Down** - select next activity
-- `K`: **PageUp** - select previous activity
-- `J`: **PageDown** - select next activity
+- `K`: **PageUp** - select previous activity (`shift-K` to move 10 down)
+- `J`: **PageDown** - select next activity (`shift-J` to move 10 up)
 - `n`: **Next** - (in activity view) next split
 - `p`: **Previous** - (in activity view) previous split
 - `o`: **ToggleSortOrder** - switch between ascending and descending order

src/app.rs

@@ -133,6 +133,7 @@ impl App<'_> {
                 filter_dialog: false,
                 sort_dialog: false,
                 rank_dialog: false,
+                use_moving_time: true,
             },
             activity_view_state: ActivityViewState {
                 pace_table_state: TableState::default(),

src/component/activity_list/list.rs

@@ -1,27 +1,24 @@
-
 use tui::{
     layout::Constraint,
     style::{Color, Modifier, Style},
     text::Span,
     widgets::{Cell, Row, Table},
 };
 
-
-use crate::{
-    app::App,
-    store::activity::{Activities},
-};
-
-
+use crate::{app::App, store::activity::Activities};
 
 pub fn activity_list_table<'a>(app: &App, activities: &'a Activities) -> Table<'a> {
     let mut rows = vec![];
+    let time_header = match app.activity_list.use_moving_time {
+        true => "🕑 Moving",
+        false => "🕑 Elapsed",
+    };
     let header_names = [
         "Date",
         "",
         "Title",
         "Dst",
-        "🕑 Time",
+        time_header,
         "👣 Pace",
         "󰓅  Speed",
         "💓 Avg. Heart",
@@ -41,13 +38,21 @@ pub fn activity_list_table<'a>(app: &App, activities: &'a Activities) -> Table<'
             Cell::from(activity.activity_type_icon()),
             Cell::from(activity.title.clone()),
             Cell::from(app.unit_formatter.distance(activity.distance)),
-            Cell::from(app.unit_formatter.stopwatch_time(activity.elapsed_time)),
-            Cell::from(
-                app.unit_formatter.pace(activity.moving_time, activity.distance),
-            ),
-            Cell::from(
-                app.unit_formatter.speed(activity.meters_per_hour()),
-            ),
+            Cell::from(app.unit_formatter.stopwatch_time(
+                match app.activity_list.use_moving_time {
+                    true => activity.moving_time,
+                    false => activity.elapsed_time,
+                },
+            )),
+            Cell::from(match app.activity_list.use_moving_time {
+                true => app
+                    .unit_formatter
+                    .pace(activity.moving_time, activity.distance),
+                false => app
+                    .unit_formatter
+                    .pace(activity.elapsed_time, activity.distance),
+            }),
+            Cell::from(app.unit_formatter.speed(activity.meters_per_hour())),
             Cell::from(
                 activity
                     .average_heartrate
@@ -58,7 +63,9 @@ pub fn activity_list_table<'a>(app: &App, activities: &'a Activities) -> Table<'
         ]));
     }
 
-    Table::new(rows, &[
+    Table::new(
+        rows,
+        &[
             Constraint::Length(10),
             Constraint::Length(2),
             Constraint::Percentage(20),
@@ -69,13 +76,14 @@ pub fn activity_list_table<'a>(app: &App, activities: &'a Activities) -> Table<'
             Constraint::Min(8),
             Constraint::Min(8),
             Constraint::Min(8),
-        ])
-        .header(
-            Row::new(headers)
-                .height(1)
-                .bottom_margin(1)
-                .style(Style::default()),
-        )
-        .highlight_style(Style::default().add_modifier(Modifier::BOLD))
-        .highlight_symbol("")
+        ],
+    )
+    .header(
+        Row::new(headers)
+            .height(1)
+            .bottom_margin(1)
+            .style(Style::default()),
+    )
+    .highlight_style(Style::default().add_modifier(Modifier::BOLD))
+    .highlight_symbol("")
 }

src/component/activity_list/mod.rs

@@ -93,6 +93,7 @@ impl View for ActivityList {
             StravaEvent::Filter => toggle_filter(app),
             StravaEvent::Sort => toggle_sort(app),
             StravaEvent::Rank => toggle_rank(app),
+            StravaEvent::MovingElapsed => toggle_moving_elapsed(app),
             StravaEvent::Enter => table_status_select_current(app),
             StravaEvent::Refresh => app.send(InputEvent::Sync),
             StravaEvent::IncreaseTolerance => {
@@ -123,6 +124,7 @@ impl View for ActivityList {
             StravaEvent::Sort,
             StravaEvent::Rank,
             StravaEvent::Refresh,
+            StravaEvent::MovingElapsed,
         ];
         events.push(StravaEvent::Anchor);
         if app.activity_anchored.is_some() {
@@ -195,6 +197,7 @@ pub struct ActivityListState {
     pub filter_dialog: bool,
     pub sort_dialog: bool,
     pub rank_dialog: bool,
+    pub use_moving_time: bool,
 }
 
 pub struct ActivityViewState {
@@ -225,3 +228,6 @@ fn toggle_sort(app: &mut App) {
 fn toggle_rank(app: &mut App) {
     app.activity_list.rank_dialog = !app.activity_list.rank_dialog;
 }
+fn toggle_moving_elapsed(app: &mut App) {
+    app.activity_list.use_moving_time = !app.activity_list.use_moving_time;
+}

src/component/activity_view.rs

@@ -71,6 +71,7 @@ impl View for ActivityView {
             StravaEvent::Previous,
             StravaEvent::Enter,
             StravaEvent::ToggleLogView,
+            StravaEvent::MovingElapsed,
             StravaEvent::Quit,
         ]
     }

src/event/keymap.rs

@@ -16,6 +16,7 @@ impl KeyMap {
         map.insert(KeyCode::Char('J'), StravaEvent::PageDown);
         map.insert(KeyCode::Char('n'), StravaEvent::Next);
         map.insert(KeyCode::Char('p'), StravaEvent::Previous);
+        map.insert(KeyCode::Char('m'), StravaEvent::MovingElapsed);
         map.insert(KeyCode::Char('o'), StravaEvent::ToggleSortOrder);
         map.insert(KeyCode::Char('u'), StravaEvent::ToggleUnitSystem);
         map.insert(KeyCode::Char('s'), StravaEvent::Sort);
@@ -82,6 +83,7 @@ pub enum StravaEvent {
     Previous,
     PageDown,
     PageUp,
+    MovingElapsed,
 }
 impl StravaEvent {
     pub fn describe(se: &StravaEvent) -> &'static str {
@@ -106,6 +108,7 @@ impl StravaEvent {
             StravaEvent::Next => "next",
             StravaEvent::Previous => "prev",
             StravaEvent::ToggleLogView => "logs",
+            StravaEvent::MovingElapsed => "moving/elapsed",
         }
     }
 }