savanni
/
monorepo
1
0
Fork 0
Code Issues 68 Pull Requests Projects 6 Releases Wiki Activity

Render time distance details in the day detail view

This commit is contained in:
Savanni D'Gerinel 2024-01-23 08:28:39 -05:00
parent 279810f7d7
commit ce8bed13f9
3 changed files with 73 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
fitnesstrax/app/src/components/day.rs
View File

@ -28,6 +28,8 @@ use glib::Object;
use gtk::{prelude::*, subclass::prelude::*};
use std::cell::RefCell;
use super::time_distance_detail;
pub struct DaySummaryPrivate {
date: gtk::Label,
}
@ -176,51 +178,18 @@ impl DayDetail {
s.append(&top_row);
/*
records.into_iter().for_each(|record| {
let record_view = match record {
Record {
data: ft_core::TraxRecord::BikeRide(record),
..
} => Some(
TimeDistanceView::new(ft_core::RecordType::BikeRide, record)
.upcast::<gtk::Widget>(),
),
Record {
data: ft_core::TraxRecord::Row(record),
..
} => Some(
TimeDistanceView::new(ft_core::RecordType::Row, record).upcast::<gtk::Widget>(),
),
Record {
data: ft_core::TraxRecord::Run(record),
..
} => Some(
TimeDistanceView::new(ft_core::RecordType::Row, record).upcast::<gtk::Widget>(),
),
Record {
data: ft_core::TraxRecord::Swim(record),
..
} => Some(
TimeDistanceView::new(ft_core::RecordType::Row, record).upcast::<gtk::Widget>(),
),
Record {
data: ft_core::TraxRecord::Walk(record),
..
} => Some(
TimeDistanceView::new(ft_core::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);
let records = view_model.records();
for emseries::Record { data, .. } in records {
match data {
TraxRecord::BikeRide(ride) => {
s.append(&time_distance_detail(RecordType::BikeRide, ride))
}
TraxRecord::Row(row) => s.append(&time_distance_detail(RecordType::Row, row)),
TraxRecord::Run(run) => s.append(&time_distance_detail(RecordType::Run, run)),
TraxRecord::Walk(walk) => s.append(&time_distance_detail(RecordType::Walk, walk)),
_ => {}
}
}
});
*/
s
}

2
fitnesstrax/app/src/components/mod.rs
View File

@ -30,7 +30,7 @@ mod text_entry;
pub use text_entry::{weight_field, TextEntry};
mod time_distance;
pub use time_distance::{time_distance_summary, TimeDistanceView};
pub use time_distance::{time_distance_detail, time_distance_summary};
mod weight;
pub use weight::WeightLabel;

40
fitnesstrax/app/src/components/time_distance.rs
View File

@ -44,33 +44,11 @@ pub fn time_distance_summary(
text.map(|text| gtk::Label::new(Some(&text)))
}
#[derive(Default)]
pub struct TimeDistanceViewPrivate {
#[allow(unused)]
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);
pub fn time_distance_detail(type_: ft_core::RecordType, record: ft_core::TimeDistance) -> gtk::Box {
let layout = gtk::Box::builder()
.orientation(gtk::Orientation::Vertical)
.hexpand(true)
.build();
let first_row = gtk::Box::builder().homogeneous(true).build();
first_row.append(
@ -111,9 +89,9 @@ impl TimeDistanceView {
.build(),
);
s.append(&first_row);
layout.append(&first_row);
s.append(
layout.append(
&gtk::Label::builder()
.halign(gtk::Align::Start)
.label(
@ -124,7 +102,5 @@ impl TimeDistanceView {
)
.build(),
);
s
}
layout
}