From 383f80919158347aa2a9fb564ae1f90050ed3bca Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Mon, 25 Dec 2023 00:36:13 -0500 Subject: [PATCH] Open and style the day detail view and add it to the navigation stack --- fitnesstrax/app/resources/style.css | 23 ++++--- fitnesstrax/app/src/app_window.rs | 52 +++++++++----- fitnesstrax/app/src/components/day.rs | 71 ++++++++++++++++++-- fitnesstrax/app/src/components/mod.rs | 2 +- fitnesstrax/app/src/views/historical_view.rs | 34 +++++++--- fitnesstrax/app/src/views/welcome_view.rs | 3 +- 6 files changed, 141 insertions(+), 44 deletions(-) diff --git a/fitnesstrax/app/resources/style.css b/fitnesstrax/app/resources/style.css index 1f3aea4..4028c61 100644 --- a/fitnesstrax/app/resources/style.css +++ b/fitnesstrax/app/resources/style.css @@ -2,32 +2,33 @@ margin: 64px; } -.welcome-title { +.welcome__title { font-size: larger; padding: 8px; } -.welcome-content { +.welcome__content { padding: 8px; } -.welcome-footer { +.welcome__footer { } -.dialog-row { - margin: 8px 0px 8px 0px; +.historical { + margin: 32px; + border-radius: 8px; +} + +.day-summary { padding: 8px; } -.daysummary { - padding: 8px; -} - -.daysummary-date { +.day-summary__date { font-size: larger; margin-bottom: 8px; } -.daysummary-weight { +.day-summary__weight { margin: 4px; } + diff --git a/fitnesstrax/app/src/app_window.rs b/fitnesstrax/app/src/app_window.rs index 6e6c975..2397d34 100644 --- a/fitnesstrax/app/src/app_window.rs +++ b/fitnesstrax/app/src/app_window.rs @@ -16,10 +16,13 @@ You should have received a copy of the GNU General Public License along with Fit use crate::{ app::App, + components::DayDetail, views::{HistoricalView, PlaceholderView, View, WelcomeView}, }; use adw::prelude::*; use chrono::{Duration, Local}; +use emseries::Record; +use ft_core::TraxRecord; use gio::resources_lookup_data; use gtk::STYLE_PROVIDER_PRIORITY_USER; use std::{cell::RefCell, path::PathBuf, rc::Rc}; @@ -81,7 +84,6 @@ impl AppWindow { let initial_view = View::Placeholder(PlaceholderView::new().upcast()); - // layout.append(&header); layout.append(&initial_view.widget()); let nav_layout = gtk::Box::new(gtk::Orientation::Vertical, 0); @@ -98,6 +100,10 @@ impl AppWindow { window.set_content(Some(&navigation)); window.present(); + let gesture = gtk::GestureClick::new(); + gesture.connect_released(|_, _, _, _| println!("detected gesture")); + layout.add_controller(gesture); + let s = Self { app: ft_app, app_id: app_id.to_owned(), @@ -107,17 +113,7 @@ impl AppWindow { navigation, }; - glib::spawn_future_local({ - let s = s.clone(); - async move { - let end = Local::now().date_naive(); - let start = end - Duration::days(7); - match s.app.records(start, end).await { - Ok(_) => s.show_historical_view(), - Err(_) => s.show_welcome_view(), - } - } - }); + s.load_records(); s } @@ -130,11 +126,37 @@ impl AppWindow { self.swap_main(view); } - fn show_historical_view(&self) { - let view = View::Historical(HistoricalView::new(vec![])); + fn show_historical_view(&self, records: Vec>) { + let view = View::Historical(HistoricalView::new(records, { + let s = self.clone(); + Rc::new(move |date, records| { + let layout = gtk::Box::new(gtk::Orientation::Vertical, 0); + layout.append(&adw::HeaderBar::new()); + layout.append(&DayDetail::new(date, records)); + let page = &adw::NavigationPage::builder() + .title(date.format("%Y-%m-%d").to_string()) + .child(&layout) + .build(); + s.navigation.push(page); + }) + })); self.swap_main(view); } + fn load_records(&self) { + glib::spawn_future_local({ + let s = self.clone(); + async move { + let end = Local::now().date_naive(); + let start = end - Duration::days(7); + match s.app.records(start, end).await { + Ok(records) => s.show_historical_view(records), + Err(_) => s.show_welcome_view(), + } + } + }); + } + // Switch views. // // This function only replaces the old view with the one which matches the current view state. @@ -153,7 +175,7 @@ impl AppWindow { async move { if s.app.open_db(path.clone()).await.is_ok() { let _ = s.settings.set("series-path", path.to_str().unwrap()); - s.show_historical_view(); + s.load_records(); } } }); diff --git a/fitnesstrax/app/src/components/day.rs b/fitnesstrax/app/src/components/day.rs index 1026a20..4c1c3db 100644 --- a/fitnesstrax/app/src/components/day.rs +++ b/fitnesstrax/app/src/components/day.rs @@ -21,7 +21,6 @@ use glib::Object; use gtk::{prelude::*, subclass::prelude::*}; use std::cell::RefCell; -#[derive(Default)] pub struct DaySummaryPrivate { date: gtk::Label, weight: RefCell>, @@ -35,7 +34,7 @@ impl ObjectSubclass for DaySummaryPrivate { fn new() -> Self { let date = gtk::Label::builder() - .css_classes(["daysummary-date"]) + .css_classes(["day-summary__date"]) .halign(gtk::Align::Start) .build(); Self { @@ -59,7 +58,7 @@ impl DaySummary { pub fn new() -> Self { let s: Self = Object::builder().build(); s.set_orientation(gtk::Orientation::Vertical); - s.set_css_classes(&["daysummary"]); + s.set_css_classes(&["day-summary"]); s.append(&s.imp().date); @@ -81,10 +80,74 @@ impl DaySummary { let label = gtk::Label::builder() .halign(gtk::Align::Start) .label(&format!("{}", weight_record.weight)) - .css_classes(["daysummary-weight"]) + .css_classes(["day-summary__weight"]) .build(); self.append(&label); *self.imp().weight.borrow_mut() = Some(label); } + + self.append( + >k::Label::builder() + .halign(gtk::Align::Start) + .label("15km of biking in 60 minutes") + .build(), + ); + } +} + +pub struct DayDetailPrivate { + date: gtk::Label, + weight: RefCell>, +} + +#[glib::object_subclass] +impl ObjectSubclass for DayDetailPrivate { + const NAME: &'static str = "DayDetail"; + type Type = DayDetail; + type ParentType = gtk::Box; + + fn new() -> Self { + let date = gtk::Label::builder() + .css_classes(["daysummary-date"]) + .halign(gtk::Align::Start) + .build(); + Self { + date, + weight: RefCell::new(None), + } + } +} + +impl ObjectImpl for DayDetailPrivate {} +impl WidgetImpl for DayDetailPrivate {} +impl BoxImpl for DayDetailPrivate {} + +glib::wrapper! { + pub struct DayDetail(ObjectSubclass) @extends gtk::Box, gtk::Widget, @implements gtk::Orientable; +} + +impl DayDetail { + pub fn new(date: chrono::NaiveDate, records: Vec) -> Self { + let s: Self = Object::builder().build(); + s.set_orientation(gtk::Orientation::Vertical); + + records.into_iter().for_each(|record| { + let record_view = match record { + TraxRecord::BikeRide(_) => gtk::Label::new(Some("BikeRide")), + TraxRecord::Row(_) => gtk::Label::new(Some("Row")), + TraxRecord::Run(_) => gtk::Label::new(Some("Run")), + TraxRecord::Steps(_) => gtk::Label::new(Some("Steps")), + TraxRecord::Swim(_) => gtk::Label::new(Some("Swim")), + TraxRecord::Walk(_) => gtk::Label::new(Some("Walk")), + TraxRecord::Weight(_) => gtk::Label::new(Some("Weight")), + }; + + record_view.add_css_class("day-detail"); + record_view.set_halign(gtk::Align::Start); + + s.append(&record_view); + }); + + s } } diff --git a/fitnesstrax/app/src/components/mod.rs b/fitnesstrax/app/src/components/mod.rs index 858f6c2..c6bce7d 100644 --- a/fitnesstrax/app/src/components/mod.rs +++ b/fitnesstrax/app/src/components/mod.rs @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with Fit */ mod day; +pub use day::{DayDetail, DaySummary}; -pub use day::DaySummary; use glib::Object; use gtk::{prelude::*, subclass::prelude::*}; use std::{cell::RefCell, path::PathBuf, rc::Rc}; diff --git a/fitnesstrax/app/src/views/historical_view.rs b/fitnesstrax/app/src/views/historical_view.rs index dde7476..8583f62 100644 --- a/fitnesstrax/app/src/views/historical_view.rs +++ b/fitnesstrax/app/src/views/historical_view.rs @@ -15,11 +15,11 @@ You should have received a copy of the GNU General Public License along with Fit */ use crate::components::DaySummary; -use emseries::{Recordable, Timestamp}; +use emseries::{Record, Recordable, Timestamp}; use ft_core::TraxRecord; use glib::Object; use gtk::{prelude::*, subclass::prelude::*}; -use std::{cell::RefCell, collections::HashMap}; +use std::{cell::RefCell, collections::HashMap, rc::Rc}; /// The historical view will show a window into the main database. It will show some version of /// daily summaries, daily details, and will provide all functions the user may need for editing @@ -46,11 +46,20 @@ glib::wrapper! { } impl HistoricalView { - pub fn new(records: Vec) -> Self { + pub fn new(records: Vec>, on_select_day: Rc) -> Self + where + SelectFn: Fn(chrono::NaiveDate, Vec) + 'static, + { let s: Self = Object::builder().build(); s.set_orientation(gtk::Orientation::Vertical); + s.set_css_classes(&["historical"]); - let day_records: GroupedRecords = GroupedRecords::from(records); + let day_records: GroupedRecords = GroupedRecords::from( + records + .into_iter() + .map(|r| r.data) + .collect::>(), + ); let model = gio::ListStore::new::(); model.extend_from_slice(&day_records.0); @@ -86,13 +95,16 @@ impl HistoricalView { .factory(&factory) .single_click_activate(true) .build(); - lst.connect_activate(|s, idx| { - // This gets triggered whenever the user clicks on an item on the list. What we - // actually want to do here is to open a modal dialog that shows all of the details of - // the day and which allows the user to edit items within that dialog. - let item = s.model().unwrap().item(idx).unwrap(); - let records = item.downcast_ref::().unwrap(); - println!("list item activated: [{:?}] {:?}", idx, records.date()); + lst.connect_activate({ + let on_select_day = on_select_day.clone(); + move |s, idx| { + // This gets triggered whenever the user clicks on an item on the list. What we + // actually want to do here is to open a modal dialog that shows all of the details of + // the day and which allows the user to edit items within that dialog. + let item = s.model().unwrap().item(idx).unwrap(); + let records = item.downcast_ref::().unwrap(); + on_select_day(records.date(), records.records()); + } }); s.append(&lst); diff --git a/fitnesstrax/app/src/views/welcome_view.rs b/fitnesstrax/app/src/views/welcome_view.rs index 682bde7..1f391a3 100644 --- a/fitnesstrax/app/src/views/welcome_view.rs +++ b/fitnesstrax/app/src/views/welcome_view.rs @@ -55,11 +55,10 @@ impl WelcomeView { // branch. let title = gtk::Label::builder() .label("Welcome to FitnessTrax") - .css_classes(["welcome-title"]) + .css_classes(["welcome__title"]) .build(); let content = gtk::Box::builder() - .css_classes(["model-content"]) .orientation(gtk::Orientation::Vertical) .vexpand(true) .build();