Totally rewrite dashboard as a GTK application #54

Merged
savanni merged 14 commits from dashboard-gtk into main 2023-08-09 18:14:01 +00:00
3 changed files with 22 additions and 5 deletions
Showing only changes of commit 1eaa7746ff - Show all commits

View File

@ -8,14 +8,13 @@ use gtk::prelude::*;
pub struct ApplicationWindow { pub struct ApplicationWindow {
pub window: gtk::ApplicationWindow, pub window: gtk::ApplicationWindow,
pub date_label: Date, pub date_label: Date,
pub next_event: gtk::Label,
pub transit_clock: TransitClock, pub transit_clock: TransitClock,
} }
impl ApplicationWindow { impl ApplicationWindow {
pub fn new(app: &gtk::Application) -> Self { pub fn new(app: &gtk::Application) -> Self {
let window = gtk::ApplicationWindow::new(app); let window = gtk::ApplicationWindow::new(app);
let date_label = Date::new();
let transit_clock = TransitClock::new();
let layout = gtk::Box::builder() let layout = gtk::Box::builder()
.orientation(gtk::Orientation::Vertical) .orientation(gtk::Orientation::Vertical)
@ -23,7 +22,20 @@ impl ApplicationWindow {
.vexpand(true) .vexpand(true)
.build(); .build();
let date_label = Date::new();
layout.append(&date_label); layout.append(&date_label);
let next_event = gtk::Label::builder()
.margin_bottom(8)
.margin_top(8)
.margin_start(8)
.margin_end(8)
.build();
next_event.add_css_class("card");
next_event.add_css_class("activatable");
layout.append(&next_event);
let transit_clock = TransitClock::new();
layout.append(&transit_clock); layout.append(&transit_clock);
window.set_child(Some(&layout)); window.set_child(Some(&layout));
@ -31,12 +43,14 @@ impl ApplicationWindow {
Self { Self {
window, window,
date_label, date_label,
next_event,
transit_clock, transit_clock,
} }
} }
pub fn update_state(&self, state: State) { pub fn update_state(&self, state: State) {
self.date_label.update_date(state.date); self.date_label.update_date(state.date);
self.next_event.set_text(&format!("{:?}", state.next_event));
if let Some(transit) = state.transit { if let Some(transit) = state.transit {
self.transit_clock.update_transit(transit); self.transit_clock.update_transit(transit);
} }

View File

@ -1,4 +1,4 @@
use chrono::{Datelike, Local}; use chrono::{Datelike, Local, Utc};
use geo_types::{Latitude, Longitude}; use geo_types::{Latitude, Longitude};
use glib::Sender; use glib::Sender;
use gtk::{prelude::*, subclass::prelude::*, Orientation}; use gtk::{prelude::*, subclass::prelude::*, Orientation};
@ -99,8 +99,10 @@ pub fn main() {
.request(latitude, longitude, Local::now()) .request(latitude, longitude, Local::now())
.await; .await;
let now = Local::now();
let state = State { let state = State {
date: IFC::from(Local::now().date_naive().with_year(12023).unwrap()), date: IFC::from(now.date_naive().with_year(12023).unwrap()),
next_event: EVENTS.next_event(now.with_timezone(&Utc)).unwrap(),
transit: Some(transit), transit: Some(transit),
}; };
loop { loop {

View File

@ -1,8 +1,9 @@
use crate::soluna_client::SunMoon; use crate::{solstices::Event, soluna_client::SunMoon};
use ifc::IFC; use ifc::IFC;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct State { pub struct State {
pub date: IFC, pub date: IFC,
pub next_event: Event,
pub transit: Option<SunMoon>, pub transit: Option<SunMoon>,
} }