fitnesstrax/app/resources/style.css

@@ -3,7 +3,7 @@
 }
 
 .welcome__title {
-    font-size: larger;
+    font-size: x-large;
     padding: 8px;
 }
 
@@ -28,21 +28,14 @@
 
 .date-range-picker__date-field {
     margin: 8px;
-    font-size: x-large;
 }
 
 .date-range-picker__search-button {
     margin: 8px;
-    font-size: x-large;
 }
 
 .date-range-picker__range-button {
     margin: 8px;
-    font-size: x-large;
-}
-
-.date-field > label {
-    font-size: x-large;
 }
 
 .date-field__year {
@@ -61,11 +54,14 @@
     padding: 8px;
 }
 
-.day-summary__date {
+.day-summary > *:not(:last-child) {
-    font-size: larger;
     margin-bottom: 8px;
 }
 
+.day-summary__date {
+    font-size: x-large;
+}
+
 .day-summary__weight {
     margin: 4px;
 }

fitnesstrax/app/src/components/day.rs

@@ -91,17 +91,16 @@ impl DaySummary {
         if let Some(w) = view_model.weight() {
             label.set_label(&w.to_string())
         }
-        row.append(&label);
-
-        self.append(&label);
 
         let label = gtk::Label::builder()
             .halign(gtk::Align::Start)
-            .css_classes(["day-summary__weight"])
+            .css_classes(["day-summary__steps"])
             .build();
         if let Some(s) = view_model.steps() {
             label.set_label(&format!("{} steps", s));
         }
+
+        row.append(&label);
         row.append(&label);
         self.append(&row);
 

fitnesstrax/app/src/components/time_distance.rs

@@ -49,7 +49,7 @@ pub fn time_distance_summary(
         (false, false) => None,
     };
 
-    text.map(|text| gtk::Label::new(Some(&text)))
+    text.map(|text| gtk::Label::builder().halign(gtk::Align::Start).label(&text).build())
 }
 
 pub fn time_distance_detail(record: ft_core::TimeDistance) -> gtk::Box {

fitnesstrax/app/src/types.rs

@@ -79,12 +79,12 @@ impl TimeFormatter {
         match parts.len() {
             0 => Err(ParseError),
             1 => Err(ParseError),
-            2 => Ok(TimeFormatter(
+            2 => chrono::NaiveTime::from_hms_opt(parts[0], parts[1], 0)
-                chrono::NaiveTime::from_hms_opt(parts[0], parts[1], 0).unwrap(),
+                .map(|v| TimeFormatter(v))
-            )),
+                .ok_or(ParseError),
-            3 => Ok(TimeFormatter(
+            3 => chrono::NaiveTime::from_hms_opt(parts[0], parts[1], parts[2])
-                chrono::NaiveTime::from_hms_opt(parts[0], parts[1], parts[2]).unwrap(),
+                .map(|v| TimeFormatter(v))
-            )),
+                .ok_or(ParseError),
             _ => Err(ParseError),
         }
     }

fitnesstrax/app/src/views/historical_view.rs

@@ -55,6 +55,7 @@ impl ObjectSubclass for HistoricalViewPrivate {
             list_view: gtk::ListView::builder()
                 .factory(&factory)
                 .single_click_activate(true)
+                .show_separators(true)
                 .build(),
             date_range_picker,
         };