Use objc2 wrappers

Cargo.toml

@@ -74,7 +74,6 @@ serde = "1"
 serde_json = "1"
 serde_with = "3"
 
-objc = "0.2"
 core-foundation = "0.9"
 system-configuration = "0.6"
 

color-theme/Cargo.toml

@@ -14,4 +14,4 @@ windows = { workspace = true, features = ["UI_ViewManagement"] }
 log = { workspace = true }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-objc = { workspace = true }
+objc2-app-kit = { version = "0.2", features = ["NSColor", "NSColorSpace"] }

color-theme/src/mac.rs

@@ -1,32 +1,22 @@
 use super::*;
-use objc::{
-    runtime::{Class, Object},
-    *,
-};
-use std::ptr::{addr_of_mut, null_mut};
-
-#[link(name = "AppKit", kind = "framework")]
-extern "C" {
-    #[link_name = "OBJC_CLASS_$_NSColor"]
-    static OBJC_CLASS__NSColor: Class;
-
-    #[link_name = "OBJC_CLASS_$_NSColorSpace"]
-    static OBJC_CLASS__NSColorSpace: Class;
-}
+use objc2_app_kit::{NSColor, NSColorSpace};
+use std::ptr::null_mut;
 
 pub fn accent() -> Option<Color> {
     unsafe {
-        let accent: *mut Object = msg_send![&OBJC_CLASS__NSColor, controlAccentColor];
-        let color_space: *mut Object = msg_send![&OBJC_CLASS__NSColorSpace, genericRGBColorSpace];
-        let accent: *mut Object = msg_send![accent, colorUsingColorSpace: color_space];
-        let mut r: f64 = 0.0;
-        let mut g: f64 = 0.0;
-        let mut b: f64 = 0.0;
-        let _: () = msg_send![accent, getRed:addr_of_mut!(r) green:addr_of_mut!(g) blue:addr_of_mut!(b) alpha:null_mut::<f64>()];
-        Some(Color {
-            r: (r * 255.0) as u8,
-            g: (g * 255.0) as u8,
-            b: (b * 255.0) as u8,
+        let accent = NSColor::controlAccentColor();
+        let color_space = NSColorSpace::genericRGBColorSpace();
+        let accent = accent.colorUsingColorSpace(&color_space);
+        accent.map(|accent| {
+            let mut r: f64 = 0.0;
+            let mut g: f64 = 0.0;
+            let mut b: f64 = 0.0;
+            accent.getRed_green_blue_alpha(&mut r, &mut g, &mut b, null_mut());
+            Color {
+                r: (r * 255.0) as u8,
+                g: (g * 255.0) as u8,
+                b: (b * 255.0) as u8,
+            }
         })
     }
 }

netstatus/Cargo.toml

@@ -18,7 +18,10 @@ windows = { workspace = true, features = [
 ] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
-objc = { workspace = true }
+objc2-core-wlan = { version = "0.2", features = [
+    "CWInterface",
+    "CWWiFiClient",
+] }
 system-configuration = { workspace = true }
 core-foundation = { workspace = true }
 

netstatus/src/sc.rs

@@ -4,10 +4,7 @@ use core_foundation::{
     runloop::{kCFRunLoopDefaultMode, CFRunLoop, CFRunLoopRef},
 };
 use flume::{r#async::RecvStream, unbounded};
-use objc::{
-    runtime::{Class, Object},
-    *,
-};
+use objc2_core_wlan::CWWiFiClient;
 use pin_project::pin_project;
 use std::{
     net::{IpAddr, Ipv4Addr, SocketAddr},
@@ -18,24 +15,15 @@ use std::{
 };
 use system_configuration::network_reachability::{ReachabilityFlags, SCNetworkReachability};
 
-#[link(name = "CoreWLAN", kind = "framework")]
-extern "C" {
-    #[link_name = "OBJC_CLASS_$_CWWiFiClient"]
-    static OBJC_CLASS__CWWiFiClient: Class;
-}
-
 unsafe fn get_ssid() -> Option<String> {
-    let client: *mut Object = msg_send![&OBJC_CLASS__CWWiFiClient, sharedWiFiClient];
-    let interface: *mut Object = msg_send![client, interface];
-    let name: *mut Object = msg_send![interface, ssid];
-    if !name.is_null() {
-        let name = std::ffi::CStr::from_ptr(msg_send![name, UTF8String])
-            .to_string_lossy()
-            .into_owned();
-        Some(name)
-    } else {
-        None
-    }
+    CWWiFiClient::sharedWiFiClient()
+        .interface()
+        .and_then(|interface| interface.ssid())
+        .map(|name| {
+            std::ffi::CStr::from_ptr(name.UTF8String())
+                .to_string_lossy()
+                .into_owned()
+        })
 }
 
 pub fn current() -> NetStatus {