Clean up iOS ffi.rs (#3530)

This makes it easier to transition to a future autogenerated version of UIKit.

src/platform_impl/ios/uikit/device.rs

@@ -1,9 +1,8 @@
-use icrate::Foundation::{MainThreadMarker, NSObject};
+use icrate::Foundation::{MainThreadMarker, NSInteger, NSObject};
+use objc2::encode::{Encode, Encoding};
 use objc2::rc::Id;
 use objc2::{extern_class, extern_methods, msg_send_id, mutability, ClassType};
 
-use super::super::ffi::UIUserInterfaceIdiom;
-
 extern_class!(
     #[derive(Debug, PartialEq, Eq, Hash)]
     pub(crate) struct UIDevice;
@@ -24,3 +23,19 @@ extern_methods!(
         pub fn userInterfaceIdiom(&self) -> UIUserInterfaceIdiom;
     }
 );
+
+#[repr(transparent)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct UIUserInterfaceIdiom(NSInteger);
+
+unsafe impl Encode for UIUserInterfaceIdiom {
+    const ENCODING: Encoding = NSInteger::ENCODING;
+}
+
+impl UIUserInterfaceIdiom {
+    pub const Unspecified: UIUserInterfaceIdiom = UIUserInterfaceIdiom(-1);
+    pub const Phone: UIUserInterfaceIdiom = UIUserInterfaceIdiom(0);
+    pub const Pad: UIUserInterfaceIdiom = UIUserInterfaceIdiom(1);
+    pub const TV: UIUserInterfaceIdiom = UIUserInterfaceIdiom(2);
+    pub const CarPlay: UIUserInterfaceIdiom = UIUserInterfaceIdiom(3);
+}

src/platform_impl/ios/uikit/geometry.rs

@@ -0,0 +1,14 @@
+use icrate::Foundation::NSUInteger;
+use objc2::encode::{Encode, Encoding};
+
+#[repr(transparent)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct UIRectEdge(pub NSUInteger);
+
+impl UIRectEdge {
+    pub const NONE: Self = Self(0);
+}
+
+unsafe impl Encode for UIRectEdge {
+    const ENCODING: Encoding = NSUInteger::ENCODING;
+}

src/platform_impl/ios/uikit/mod.rs

@@ -9,6 +9,7 @@ mod application;
 mod coordinate_space;
 mod device;
 mod event;
+mod geometry;
 mod gesture_recognizer;
 mod responder;
 mod screen;
@@ -22,8 +23,9 @@ mod window;
 
 pub(crate) use self::application::UIApplication;
 pub(crate) use self::coordinate_space::UICoordinateSpace;
-pub(crate) use self::device::UIDevice;
+pub(crate) use self::device::{UIDevice, UIUserInterfaceIdiom};
 pub(crate) use self::event::UIEvent;
+pub(crate) use self::geometry::UIRectEdge;
 pub(crate) use self::gesture_recognizer::{
     UIGestureRecognizer, UIGestureRecognizerState, UIPinchGestureRecognizer,
     UIRotationGestureRecognizer, UITapGestureRecognizer,

src/platform_impl/ios/uikit/status_bar_style.rs

@@ -1,4 +1,3 @@
-use crate::platform::ios::StatusBarStyle;
 use icrate::Foundation::NSInteger;
 use objc2::encode::{Encode, Encoding};
 
@@ -12,16 +11,6 @@ pub enum UIStatusBarStyle {
     DarkContent = 3,
 }
 
-impl From<StatusBarStyle> for UIStatusBarStyle {
-    fn from(value: StatusBarStyle) -> Self {
-        match value {
-            StatusBarStyle::Default => Self::Default,
-            StatusBarStyle::LightContent => Self::LightContent,
-            StatusBarStyle::DarkContent => Self::DarkContent,
-        }
-    }
-}
-
 unsafe impl Encode for UIStatusBarStyle {
     const ENCODING: Encoding = NSInteger::ENCODING;
 }