Compare commits
No commits in common. "4afdd16414515e94e87990c124515873f0f03632" and "bfd23bff5bcd61a7eb9805569399dcbdf665fb92" have entirely different histories.
4afdd16414
...
bfd23bff5b
|
|
@ -335,14 +335,12 @@ dependencies = [
|
|||
"fluent",
|
||||
"fluent-ergonomics",
|
||||
"futures",
|
||||
"gdk4",
|
||||
"geo-types",
|
||||
"gio",
|
||||
"glib",
|
||||
"gtk4",
|
||||
"ifc",
|
||||
"lazy_static",
|
||||
"libadwaita",
|
||||
"memorycache",
|
||||
"reqwest",
|
||||
"serde",
|
||||
|
|
@ -1265,39 +1263,6 @@ version = "0.5.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
|
||||
|
||||
[[package]]
|
||||
name = "libadwaita"
|
||||
version = "0.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"gdk-pixbuf",
|
||||
"gdk4",
|
||||
"gio",
|
||||
"glib",
|
||||
"gtk4",
|
||||
"libadwaita-sys",
|
||||
"libc",
|
||||
"pango",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libadwaita-sys"
|
||||
version = "0.4.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404"
|
||||
dependencies = [
|
||||
"gdk4-sys",
|
||||
"gio-sys",
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
"gtk4-sys",
|
||||
"libc",
|
||||
"pango-sys",
|
||||
"system-deps",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.147"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ edition = "2018"
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
adw = { version = "0.4", package = "libadwaita", features = [ "v1_2" ] }
|
||||
cairo-rs = { version = "0.17" }
|
||||
chrono = { version = "0.4", features = ["serde"] }
|
||||
fluent-ergonomics = { path = "../fluent-ergonomics/" }
|
||||
|
|
@ -15,7 +14,6 @@ futures = { version = "0.3" }
|
|||
geo-types = { path = "../geo-types/" }
|
||||
gio = { version = "0.17" }
|
||||
glib = { version = "0.17" }
|
||||
gdk = { version = "0.6", package = "gdk4" }
|
||||
gtk = { version = "0.6", package = "gtk4" }
|
||||
ifc = { path = "../ifc/" }
|
||||
lazy_static = { version = "1.4" }
|
||||
|
|
|
|||
|
|
@ -2,20 +2,19 @@ use crate::{
|
|||
components::{Date, TransitClock},
|
||||
types::State,
|
||||
};
|
||||
use adw::prelude::AdwApplicationWindowExt;
|
||||
use gtk::prelude::*;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct ApplicationWindow {
|
||||
pub window: adw::ApplicationWindow,
|
||||
pub window: gtk::ApplicationWindow,
|
||||
pub date_label: Date,
|
||||
pub next_event: gtk::Label,
|
||||
pub transit_clock: TransitClock,
|
||||
}
|
||||
|
||||
impl ApplicationWindow {
|
||||
pub fn new(app: &adw::Application) -> Self {
|
||||
let window = adw::ApplicationWindow::new(app);
|
||||
pub fn new(app: >k::Application) -> Self {
|
||||
let window = gtk::ApplicationWindow::new(app);
|
||||
|
||||
let layout = gtk::Box::builder()
|
||||
.orientation(gtk::Orientation::Vertical)
|
||||
|
|
@ -39,7 +38,7 @@ impl ApplicationWindow {
|
|||
let transit_clock = TransitClock::new();
|
||||
layout.append(&transit_clock);
|
||||
|
||||
window.set_content(Some(&layout));
|
||||
window.set_child(Some(&layout));
|
||||
|
||||
Self {
|
||||
window,
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ impl TransitClock {
|
|||
s.set_draw_func({
|
||||
let s = s.clone();
|
||||
move |_, context, width, height| {
|
||||
let style_context = WidgetExt::style_context(&s);
|
||||
let center_x = width as f64 / 2.;
|
||||
let center_y = height as f64 / 2.;
|
||||
let radius = width.min(height) as f64 / 2. * 0.9;
|
||||
|
|
@ -52,35 +51,20 @@ impl TransitClock {
|
|||
let sunrise = info.sunrise - NaiveTime::from_hms_opt(0, 0, 0).unwrap();
|
||||
let sunset = info.sunset - NaiveTime::from_hms_opt(0, 0, 0).unwrap();
|
||||
|
||||
let night_color = style_context.lookup_color("dark_5").unwrap();
|
||||
let day_color = style_context.lookup_color("blue_1").unwrap();
|
||||
|
||||
PieChart::new(&style_context)
|
||||
PieChart::new()
|
||||
.center(center_x, center_y)
|
||||
.radius(radius)
|
||||
.rotation(-PI / 2.)
|
||||
.wedges(
|
||||
vec![
|
||||
Wedge {
|
||||
start_angle: (PI * 2.) * sunset.num_seconds() as f64 / full_day,
|
||||
end_angle: (PI * 2.) * sunrise.num_seconds() as f64 / full_day,
|
||||
color: Color {
|
||||
r: night_color.red() as f64,
|
||||
g: night_color.green() as f64,
|
||||
b: night_color.blue() as f64,
|
||||
},
|
||||
vec![Wedge {
|
||||
start_angle: (PI * 2.) * sunset.num_seconds() as f64 / full_day,
|
||||
end_angle: (PI * 2.) * sunrise.num_seconds() as f64 / full_day,
|
||||
color: Color {
|
||||
r: 0.1,
|
||||
g: 0.1,
|
||||
b: 0.8,
|
||||
},
|
||||
Wedge {
|
||||
start_angle: (PI * 2.) * sunrise.num_seconds() as f64
|
||||
/ full_day,
|
||||
end_angle: (PI * 2.) * sunset.num_seconds() as f64 / full_day,
|
||||
color: Color {
|
||||
r: day_color.red() as f64,
|
||||
g: day_color.green() as f64,
|
||||
b: day_color.blue() as f64,
|
||||
},
|
||||
},
|
||||
]
|
||||
}]
|
||||
.into_iter(),
|
||||
)
|
||||
.draw(context);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
use cairo::Context;
|
||||
use gtk::{gdk::RGBA, prelude::*, StyleContext};
|
||||
use std::f64::consts::PI;
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
|
|
@ -22,19 +21,16 @@ pub struct PieChart {
|
|||
center_x: f64,
|
||||
center_y: f64,
|
||||
radius: f64,
|
||||
|
||||
border_color: RGBA,
|
||||
}
|
||||
|
||||
impl PieChart {
|
||||
pub fn new(style_context: &StyleContext) -> Self {
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
rotation: 0.,
|
||||
wedges: vec![],
|
||||
center_x: 0.,
|
||||
center_y: 0.,
|
||||
radius: 0.,
|
||||
border_color: style_context.lookup_color("theme_fg_color").unwrap(),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -85,11 +81,7 @@ impl PieChart {
|
|||
},
|
||||
);
|
||||
|
||||
context.set_source_rgb(
|
||||
self.border_color.red() as f64,
|
||||
self.border_color.green() as f64,
|
||||
self.border_color.blue() as f64,
|
||||
);
|
||||
context.set_source_rgb(1., 1., 1.);
|
||||
context.arc(self.center_x, self.center_y, self.radius, 0., 2. * PI);
|
||||
let _ = context.stroke();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ pub struct Core {
|
|||
}
|
||||
|
||||
pub fn main() {
|
||||
let app = adw::Application::builder()
|
||||
let app = gtk::Application::builder()
|
||||
.application_id("com.luminescent-dreams.dashboard")
|
||||
.resource_base_path("/com/luminescent-dreams/dashboard")
|
||||
.build();
|
||||
|
|
@ -94,22 +94,21 @@ pub fn main() {
|
|||
async move {
|
||||
let soluna_client = SolunaClient::new();
|
||||
|
||||
let transit = soluna_client
|
||||
.request(latitude, longitude, Local::now())
|
||||
.await;
|
||||
|
||||
let now = Local::now();
|
||||
let state = State {
|
||||
date: IFC::from(now.date_naive().with_year(12023).unwrap()),
|
||||
next_event: EVENTS.next_event(now.with_timezone(&Utc)).unwrap(),
|
||||
transit: Some(transit),
|
||||
};
|
||||
loop {
|
||||
let transit = soluna_client
|
||||
.request(latitude.clone(), longitude.clone(), Local::now())
|
||||
.await;
|
||||
|
||||
let now = Local::now();
|
||||
let state = State {
|
||||
date: IFC::from(now.date_naive().with_year(12023).unwrap()),
|
||||
next_event: EVENTS.next_event(now.with_timezone(&Utc)).unwrap(),
|
||||
transit: Some(transit),
|
||||
};
|
||||
|
||||
if let Some(ref gtk_tx) = *core.tx.read().unwrap() {
|
||||
let _ = gtk_tx.send(Message::Refresh(state.clone()));
|
||||
}
|
||||
std::thread::sleep(std::time::Duration::from_secs(60));
|
||||
std::thread::sleep(std::time::Duration::from_secs(300));
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// 41.78, -71.41
|
||||
// https://api.solunar.org/solunar/41.78,-71.41,20211029,-4
|
||||
|
||||
use chrono::{DateTime, Duration, Local, NaiveTime, Offset, TimeZone, Timelike, Utc};
|
||||
use chrono::{DateTime, Duration, NaiveTime, Offset, TimeZone, Utc};
|
||||
use geo_types::{Latitude, Longitude};
|
||||
use memorycache::MemoryCache;
|
||||
use reqwest;
|
||||
|
|
@ -111,16 +111,7 @@ impl SolunaClient {
|
|||
.and_then(|header| header.to_str().ok())
|
||||
.and_then(|expiration| DateTime::parse_from_rfc2822(expiration).ok())
|
||||
.map(|dt_local| DateTime::<Utc>::from(dt_local))
|
||||
.unwrap_or(
|
||||
Local::now()
|
||||
.with_hour(0)
|
||||
.and_then(|dt| dt.with_minute(0))
|
||||
.and_then(|dt| dt.with_second(0))
|
||||
.and_then(|dt| dt.with_nanosecond(0))
|
||||
.map(|dt| dt.with_timezone(&Utc))
|
||||
.unwrap()
|
||||
+ Duration::days(1),
|
||||
);
|
||||
.unwrap_or(Utc::now() + Duration::seconds(3600));
|
||||
let soluna: SunMoonJs = response.json().await.unwrap();
|
||||
(expiration, soluna)
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue