fitnesstrax/app/resources/style.css

@@ -32,8 +32,3 @@
     margin: 4px;
 }
 
-.weight-view {
-    padding: 8px;
-    margin: 8px;
-}
-

fitnesstrax/app/src/components/day.rs

@@ -16,11 +16,10 @@ You should have received a copy of the GNU General Public License along with Fit
 
 // use chrono::NaiveDate;
 // use ft_core::TraxRecord;
-use dimensioned::si;
+use ft_core::TraxRecord;
-use ft_core::{RecordType, TimeDistance, TraxRecord, Weight};
 use glib::Object;
 use gtk::{prelude::*, subclass::prelude::*};
-use std::{cell::RefCell, rc::Rc};
+use std::cell::RefCell;
 
 pub struct DaySummaryPrivate {
     date: gtk::Label,
@@ -132,249 +131,23 @@ impl DayDetail {
         let s: Self = Object::builder().build();
         s.set_orientation(gtk::Orientation::Vertical);
 
-        let click_controller = gtk::GestureClick::new();
-        click_controller.connect_released({
-            let s = s.clone();
-            move |_, _, _, _| {
-                println!("clicked outside of focusable entity");
-                if let Some(widget) = s.focus_child().and_downcast_ref::<WeightView>() {
-                    println!("focused child is the weight view");
-                    widget.blur();
-                }
-            }
-        });
-        s.add_controller(click_controller);
-
-        let weight_record = records.iter().find_map(|record| match record {
-            TraxRecord::Weight(record) => Some(record.clone()),
-            _ => None,
-        });
-
-        let weight_view = WeightView::new(weight_record, |weight| {
-            println!("on_blur on the weight view: {:?}", weight)
-        });
-        s.append(&weight_view);
-
         records.into_iter().for_each(|record| {
             let record_view = match record {
-                TraxRecord::BikeRide(record) => Some(
+                TraxRecord::BikeRide(_) => gtk::Label::new(Some("BikeRide")),
-                    TimeDistanceView::new(RecordType::BikeRide, record).upcast::<gtk::Widget>(),
+                TraxRecord::Row(_) => gtk::Label::new(Some("Row")),
-                ),
+                TraxRecord::Run(_) => gtk::Label::new(Some("Run")),
-                TraxRecord::Row(record) => {
+                TraxRecord::Steps(_) => gtk::Label::new(Some("Steps")),
-                    Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>())
+                TraxRecord::Swim(_) => gtk::Label::new(Some("Swim")),
-                }
+                TraxRecord::Walk(_) => gtk::Label::new(Some("Walk")),
-                TraxRecord::Run(record) => {
+                TraxRecord::Weight(_) => gtk::Label::new(Some("Weight")),
-                    Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>())
-                }
-                TraxRecord::Swim(record) => {
-                    Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>())
-                }
-                TraxRecord::Walk(record) => {
-                    Some(TimeDistanceView::new(RecordType::Row, record).upcast::<gtk::Widget>())
-                }
-                _ => None,
             };
 
-            if let Some(record_view) = record_view {
             record_view.add_css_class("day-detail");
             record_view.set_halign(gtk::Align::Start);
 
             s.append(&record_view);
-            }
         });
 
         s
     }
 }
-
-pub struct WeightViewPrivate {
-    record: RefCell<Option<Weight>>,
-    view: RefCell<gtk::Label>,
-    edit: RefCell<gtk::Entry>,
-    current: RefCell<gtk::Widget>,
-    on_edit_finished: RefCell<Box<dyn Fn(si::Kilogram<f64>)>>,
-}
-
-impl Default for WeightViewPrivate {
-    fn default() -> Self {
-        let view = gtk::Label::builder()
-            .css_classes(["card", "weight-view"])
-            .halign(gtk::Align::Start)
-            .can_focus(true)
-            .build();
-        let edit = gtk::Entry::builder().halign(gtk::Align::Start).build();
-
-        let current = view.clone();
-
-        Self {
-            record: RefCell::new(None),
-            view: RefCell::new(view),
-            edit: RefCell::new(edit),
-            current: RefCell::new(current.upcast()),
-            on_edit_finished: RefCell::new(Box::new(|_| {})),
-        }
-    }
-}
-
-#[glib::object_subclass]
-impl ObjectSubclass for WeightViewPrivate {
-    const NAME: &'static str = "WeightView";
-    type Type = WeightView;
-    type ParentType = gtk::Box;
-}
-
-impl ObjectImpl for WeightViewPrivate {}
-impl WidgetImpl for WeightViewPrivate {}
-impl BoxImpl for WeightViewPrivate {}
-
-glib::wrapper! {
-    pub struct WeightView(ObjectSubclass<WeightViewPrivate>) @extends gtk::Box, gtk::Widget;
-}
-
-impl WeightView {
-    pub fn new<OnEditFinished>(weight: Option<Weight>, on_edit_finished: OnEditFinished) -> Self
-    where
-        OnEditFinished: Fn(si::Kilogram<f64>) + 'static,
-    {
-        let s: Self = Object::builder().build();
-
-        *s.imp().on_edit_finished.borrow_mut() = Box::new(on_edit_finished);
-
-        *s.imp().record.borrow_mut() = weight;
-        s.view();
-
-        let view_click_controller = gtk::GestureClick::new();
-        view_click_controller.connect_released({
-            let s = s.clone();
-            move |_, _, _, _| {
-                s.edit();
-            }
-        });
-
-        s.imp().view.borrow().add_controller(view_click_controller);
-        s
-    }
-
-    fn view(&self) {
-        let view = self.imp().view.borrow();
-        match *self.imp().record.borrow() {
-            Some(ref record) => {
-                view.remove_css_class("dim_label");
-                view.set_label(&format!("{:?}", record.weight));
-            }
-            None => {
-                view.add_css_class("dim_label");
-                view.set_label("No weight recorded");
-            }
-        }
-        self.swap(view.clone().upcast());
-    }
-
-    fn edit(&self) {
-        let edit = self.imp().edit.borrow();
-        match *self.imp().record.borrow() {
-            Some(ref record) => edit.buffer().set_text(&format!("{:?}", record.weight)),
-            None => edit.buffer().set_text(""),
-        }
-        self.swap(edit.clone().upcast());
-        edit.grab_focus();
-    }
-
-    fn swap(&self, new_view: gtk::Widget) {
-        let mut current = self.imp().current.borrow_mut();
-        self.remove(&*current);
-        self.append(&new_view);
-        *current = new_view;
-    }
-
-    fn blur(&self) {
-        if *self.imp().current.borrow() == *self.imp().edit.borrow() {
-            self.imp().on_edit_finished.borrow()(0. * si::KG);
-            self.view();
-        }
-    }
-}
-
-#[derive(Default)]
-pub struct TimeDistanceViewPrivate {
-    record: RefCell<Option<TimeDistance>>,
-}
-
-#[glib::object_subclass]
-impl ObjectSubclass for TimeDistanceViewPrivate {
-    const NAME: &'static str = "TimeDistanceView";
-    type Type = TimeDistanceView;
-    type ParentType = gtk::Box;
-}
-
-impl ObjectImpl for TimeDistanceViewPrivate {}
-impl WidgetImpl for TimeDistanceViewPrivate {}
-impl BoxImpl for TimeDistanceViewPrivate {}
-
-glib::wrapper! {
-    pub struct TimeDistanceView(ObjectSubclass<TimeDistanceViewPrivate>) @extends gtk::Box, gtk::Widget, @implements gtk::Orientable;
-}
-
-impl TimeDistanceView {
-    pub fn new(type_: RecordType, record: TimeDistance) -> Self {
-        let s: Self = Object::builder().build();
-        s.set_orientation(gtk::Orientation::Vertical);
-        s.set_hexpand(true);
-
-        let first_row = gtk::Box::builder().homogeneous(true).build();
-
-        first_row.append(
-            &gtk::Label::builder()
-                .halign(gtk::Align::Start)
-                .label(&record.datetime.0.format("%H:%M").to_string())
-                .build(),
-        );
-
-        first_row.append(
-            &gtk::Label::builder()
-                .halign(gtk::Align::Start)
-                .label(format!("{:?}", type_))
-                .build(),
-        );
-
-        first_row.append(
-            &gtk::Label::builder()
-                .halign(gtk::Align::Start)
-                .label(
-                    record
-                        .distance
-                        .map(|dist| format!("{}", dist))
-                        .unwrap_or("".to_owned()),
-                )
-                .build(),
-        );
-
-        first_row.append(
-            &gtk::Label::builder()
-                .halign(gtk::Align::Start)
-                .label(
-                    record
-                        .duration
-                        .map(|duration| format!("{}", duration))
-                        .unwrap_or("".to_owned()),
-                )
-                .build(),
-        );
-
-        s.append(&first_row);
-
-        s.append(
-            &gtk::Label::builder()
-                .halign(gtk::Align::Start)
-                .label(
-                    record
-                        .comments
-                        .map(|comments| format!("{}", comments))
-                        .unwrap_or("".to_owned()),
-                )
-                .build(),
-        );
-
-        s
-    }
-}

fitnesstrax/core/src/lib.rs

@@ -4,4 +4,4 @@ use emseries::DateTimeTz;
 
 mod legacy;
 mod types;
-pub use types::{RecordType, Steps, TimeDistance, TraxRecord, Weight};
+pub use types::{Steps, TimeDistance, TraxRecord, Weight};

fitnesstrax/core/src/types.rs

@@ -52,17 +52,6 @@ pub struct Weight {
     pub weight: si::Kilogram<f64>,
 }
 
-#[derive(Clone, Debug, PartialEq)]
-pub enum RecordType {
-    BikeRide,
-    Row,
-    Run,
-    Steps,
-    Swim,
-    Walk,
-    Weight,
-}
-
 /// The unified data structure for all records that are part of the app.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub enum TraxRecord {
@@ -76,18 +65,6 @@ pub enum TraxRecord {
 }
 
 impl TraxRecord {
-    pub fn workout_type(&self) -> RecordType {
-        match self {
-            TraxRecord::BikeRide(_) => RecordType::BikeRide,
-            TraxRecord::Row(_) => RecordType::Row,
-            TraxRecord::Run(_) => RecordType::Run,
-            TraxRecord::Steps(_) => RecordType::Steps,
-            TraxRecord::Swim(_) => RecordType::Swim,
-            TraxRecord::Walk(_) => RecordType::Walk,
-            TraxRecord::Weight(_) => RecordType::Weight,
-        }
-    }
-
     pub fn is_weight(&self) -> bool {
         match self {
             TraxRecord::Weight(_) => true,