From 2a7d07c9665a359b9c1eac90188f686c9ce781f2 Mon Sep 17 00:00:00 2001
From: Alexander Bachmann <a.t.bachmann@gmail.com>
Date: Mon, 26 May 2025 22:56:09 +0200
Subject: [PATCH] chore: fix compiler warnings

---
 cosmic-settings/src/app.rs                    |  4 +---
 .../src/pages/accessibility/mod.rs            |  2 +-
 .../src/pages/desktop/wallpaper/config.rs     |  1 -
 cosmic-settings/src/pages/networking/wifi.rs  |  6 ++++-
 cosmic-settings/src/pages/sound.rs            |  2 +-
 cosmic-settings/src/subscription/daytime.rs   | 23 +++++++++----------
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cosmic-settings/src/app.rs b/cosmic-settings/src/app.rs
index ee9d6ed..b76b4e3 100644
--- a/cosmic-settings/src/app.rs
+++ b/cosmic-settings/src/app.rs
@@ -43,9 +43,7 @@ use cosmic::{
 use cosmic_panel_config::CosmicPanelConfig;
 use cosmic_settings_page::{self as page, section};
 #[cfg(feature = "page-accessibility")]
-use cosmic_settings_subscriptions::accessibility::{
-    DBusRequest, DBusUpdate, subscription as a11y_subscription,
-};
+use cosmic_settings_subscriptions::accessibility::subscription as a11y_subscription;
 #[cfg(feature = "wayland")]
 use desktop::{
     dock,
diff --git a/cosmic-settings/src/pages/accessibility/mod.rs b/cosmic-settings/src/pages/accessibility/mod.rs
index 22972e3..7bfed3e 100644
--- a/cosmic-settings/src/pages/accessibility/mod.rs
+++ b/cosmic-settings/src/pages/accessibility/mod.rs
@@ -13,7 +13,7 @@ use cosmic_settings_page::{
     self as page, Insert,
     section::{self, Section},
 };
-use cosmic_settings_subscriptions::accessibility::{self, DBusRequest, DBusUpdate};
+use cosmic_settings_subscriptions::accessibility::{DBusRequest, DBusUpdate};
 use cosmic_settings_subscriptions::cosmic_a11y_manager;
 use num_traits::FromPrimitive;
 use slotmap::SlotMap;
diff --git a/cosmic-settings/src/pages/desktop/wallpaper/config.rs b/cosmic-settings/src/pages/desktop/wallpaper/config.rs
index 2cb8193..cecf8c9 100644
--- a/cosmic-settings/src/pages/desktop/wallpaper/config.rs
+++ b/cosmic-settings/src/pages/desktop/wallpaper/config.rs
@@ -6,7 +6,6 @@ use cosmic_bg_config::Source;
 use cosmic_settings_wallpaper as wallpaper;
 use std::collections::VecDeque;
 use std::env;
-use std::io::Read;
 use std::path::{Path, PathBuf};
 
 const NAME: &str = "com.system76.CosmicSettings.Wallpaper";
diff --git a/cosmic-settings/src/pages/networking/wifi.rs b/cosmic-settings/src/pages/networking/wifi.rs
index 66f5af7..dc6269d 100644
--- a/cosmic-settings/src/pages/networking/wifi.rs
+++ b/cosmic-settings/src/pages/networking/wifi.rs
@@ -291,7 +291,11 @@ impl Page {
                         }
                     }
 
-                    network_manager::Request::SelectAccessPoint(ssid, hw_address, network_type) => {
+                    network_manager::Request::SelectAccessPoint(
+                        ssid,
+                        _hw_address,
+                        _network_type,
+                    ) => {
                         self.connecting.remove(ssid.as_ref());
                     }
 
diff --git a/cosmic-settings/src/pages/sound.rs b/cosmic-settings/src/pages/sound.rs
index 3e4546e..04025af 100644
--- a/cosmic-settings/src/pages/sound.rs
+++ b/cosmic-settings/src/pages/sound.rs
@@ -362,7 +362,7 @@ impl Page {
                 }
 
                 let mut command = None;
-                if let Some(&node_id) = self.sink_ids.get(self.active_sink.unwrap_or(0)) {
+                if !self.sink_ids.get(self.active_sink.unwrap_or(0)).is_none() {
                     command = Some(cosmic::task::future(async move {
                         tokio::time::sleep(Duration::from_millis(64)).await;
                         crate::pages::Message::Sound(Message::SinkBalanceApply)
diff --git a/cosmic-settings/src/subscription/daytime.rs b/cosmic-settings/src/subscription/daytime.rs
index 5019825..2fd90ff 100644
--- a/cosmic-settings/src/subscription/daytime.rs
+++ b/cosmic-settings/src/subscription/daytime.rs
@@ -1,13 +1,12 @@
 use std::any::TypeId;
 
 use ashpd::desktop::location::{Location, LocationProxy};
-use chrono::Datelike;
 use cosmic::iced::{
     Subscription,
     futures::{SinkExt, StreamExt, channel::mpsc::Sender, future},
     stream,
 };
-use sunrise::sunrise_sunset;
+use sunrise::{Coordinates, SolarDay, SolarEvent};
 use tokio::select;
 
 pub fn daytime() -> cosmic::iced::Subscription<bool> {
@@ -45,11 +44,16 @@ async fn inner(mut tx: Sender<bool>) -> anyhow::Result<()> {
         let Some(loc) = loc.as_ref() else {
             break;
         };
-        let (lat, long) = (loc.latitude(), loc.longitude());
+
+        let coord = Coordinates::new(loc.latitude(), loc.longitude()).unwrap();
         let now = chrono::Local::now();
         let date = now.date_naive();
-        let (sunrise, sunset) = sunrise_sunset(lat, long, date.year(), date.month0(), date.day0());
         let now_in_seconds = now.timestamp();
+        let current_solar_day = SolarDay::new(coord, date);
+        let sunrise = current_solar_day
+            .event_time(SolarEvent::Sunrise)
+            .timestamp();
+        let sunset = current_solar_day.event_time(SolarEvent::Sunset).timestamp();
         let daytime = now_in_seconds >= sunrise && now_in_seconds <= sunset;
         tx.send(daytime).await?;
 
@@ -59,14 +63,9 @@ async fn inner(mut tx: Sender<bool>) -> anyhow::Result<()> {
             sunrise - now_in_seconds
         } else {
             let tmrw = now + chrono::Duration::days(1);
-            let tmrw_date = tmrw.date_naive();
-            let (tmrw_sunrise, _) = sunrise_sunset(
-                lat,
-                long,
-                tmrw_date.year(),
-                tmrw_date.month0(),
-                tmrw_date.day0(),
-            );
+            let tmrw_sunrise = SolarDay::new(coord, tmrw.date_naive())
+                .event_time(SolarEvent::Sunrise)
+                .timestamp();
             tmrw_sunrise - now_in_seconds
         };
         next = select! {