Merge remote-tracking branch 'refs/remotes/origin/main'

Author: crystall1nedev

Natives/UIKit+hook.h

@@ -1,11 +1,10 @@
 #import <UIKit/UIKit.h>
 
-#define realUIIdiom UIDevice.currentDevice.hook_userInterfaceIdiom
+#define realUIIdiom UIDevice.currentDevice.userInterfaceIdiom
 extern NSNotificationName UIPresentationControllerPresentationTransitionWillBeginNotification;
 
 @interface UIDevice(hook)
 - (NSString *)completeOSVersion;
-- (UIUserInterfaceIdiom)hook_userInterfaceIdiom;
 @end
 
 @interface UIImageView(hook)
@@ -27,12 +26,17 @@ extern NSNotificationName UIPresentationControllerPresentationTransitionWillBegi
 
 @interface UIDevice(private)
 - (NSString *)buildVersion;
+- (void)_setActiveUserInterfaceIdiom:(NSInteger)idiom;
 @end
 
 @interface UIImage(private)
 - (UIImage *)_imageWithSize:(CGSize)size;
 @end
 
+@interface UIScreen(private)
+- (void)_setUserInterfaceIdiom:(NSInteger)idiom;
+@end
+
 @interface UITextField(private)
 @property(assign, nonatomic) NSInteger nonEditingLinebreakMode;
 @end

Natives/UIKit+hook.m

@@ -29,7 +29,10 @@ void swizzleUIImageMethod(SEL originalAction, SEL swizzledAction) {
 }
 
 void init_hookUIKitConstructor(void) {
-    swizzle(UIDevice.class, @selector(userInterfaceIdiom), @selector(hook_userInterfaceIdiom));
+    UIUserInterfaceIdiom idiom = getPrefBool(@"debug.debug_ipad_ui") ? UIUserInterfaceIdiomPad : UIUserInterfaceIdiomPhone;
+    [UIDevice.currentDevice _setActiveUserInterfaceIdiom:idiom];
+    [UIScreen.mainScreen _setUserInterfaceIdiom:idiom];
+    
     swizzle(UIImageView.class, @selector(setImage:), @selector(hook_setImage:));
     if(UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPhone) {
         swizzle(UIPointerInteraction.class, @selector(_updateInteractionIsEnabled), @selector(hook__updateInteractionIsEnabled));
@@ -58,16 +61,6 @@ - (NSString *)completeOSVersion {
     return [NSString stringWithFormat:@"%@ %@ (%@)", self.systemName, self.systemVersion, self.buildVersion];
 }
 
-- (UIUserInterfaceIdiom)hook_userInterfaceIdiom {
-    if (getPrefBool(@"debug.debug_ipad_ui")) {
-        return UIUserInterfaceIdiomPad;
-    } else if (self.hook_userInterfaceIdiom == UIUserInterfaceIdiomTV) {
-        return self.hook_userInterfaceIdiom;
-    } else {
-        return UIUserInterfaceIdiomPhone;
-    }
-}
-
 @end
 
 // Patch: emulate scaleToFill for table views

Natives/main.m

@@ -296,10 +296,10 @@ int main(int argc, char *argv[]) {
     init_redirectStdio();
     init_logDeviceAndVer(argv[0]);
 
+    loadPreferences(NO);
     init_hookFunctions();
     init_hookUIKitConstructor();
 
-    loadPreferences(NO);
     debugLogEnabled = getPrefBool(@"general.debug_logging");
     NSLog(@"[Debugging] Debug log enabled: %@", debugLogEnabled ? @"YES" : @"NO");