iPhone iOS18対応 Tabが押せない不具合修正

Seilassist/Sailassist.xcodeproj/project.pbxproj

@@ -958,10 +958,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Sailassist/Pods-Sailassist-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Sailassist/Pods-Sailassist-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Sailassist/Pods-Sailassist-frameworks.sh\"\n";
@@ -1295,12 +1299,15 @@
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UIRequiresFullScreen = YES;
+				INFOPLIST_KEY_UIStatusBarStyle = "";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				MARKETING_VERSION = 1.0.3;
 				OTHER_SWIFT_FLAGS = "-D CANARY -D COCOAPODS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jrc.sailassist.canary;
@@ -1338,12 +1345,15 @@
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UIRequiresFullScreen = YES;
+				INFOPLIST_KEY_UIStatusBarStyle = "";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				MARKETING_VERSION = 1.0.3;
 				OTHER_SWIFT_FLAGS = "-D COCOAPODS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jrc.sailassist;
@@ -1524,12 +1534,15 @@
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UIRequiresFullScreen = YES;
+				INFOPLIST_KEY_UIStatusBarStyle = "";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				MARKETING_VERSION = 1.0.3;
 				OTHER_SWIFT_FLAGS = "-D QC -D COCOAPODS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jrc.sailassist.qc;

Seilassist/Sailassist/Map/MapInformation.swift

@@ -22,7 +22,7 @@ struct MapInformation: View {
                     .cornerRadius(3)
             }
             .padding(.top, 100)
-            .padding(.trailing, 200)
+            .padding(.trailing, positionLocation())
             VStack {
                 ForEach(ngaData.ngaArea.map{ $0.1 }.filter{ $0.passingCnt > 0 }, id: \.name) { nga in
                     Text("Entering NGA \(nga.name)")
@@ -44,6 +44,15 @@ struct MapInformation: View {
         }
         return location
     }
+
+    func positionLocation() -> CGFloat {
+        var yPos: CGFloat = 200
+        if UIDevice.current.userInterfaceIdiom == .pad {
+            yPos = 900
+        }
+
+        return yPos
+    }
 }
 
 #Preview {

Seilassist/Sailassist/SailassistApp.swift

@@ -454,15 +454,36 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, ObservableObject {
         let tabWindow = PassThroughWindow(windowScene: scene)
         tabWindow.rootViewController = tabBarController
         tabWindow.isHidden = false
-        
         self.tabWindow = tabWindow
     }
 }
 
 class PassThroughWindow: UIWindow{
+//    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+//        guard let view = super.hitTest(point, with: event) else { return nil}
+//        return rootViewController?.view == view ? nil : view
+//    }
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        guard let view = super.hitTest(point, with: event) else { return nil}
-        return rootViewController?.view == view ? nil : view
+        let view = super.hitTest(point, with: event)
+
+        if let view = view {
+            print("Hit test view: \(view), at point: \(point)")
+            print("View hierarchy: \(type(of: view)) -> \(view.superview)")
+        } else {
+            print("Hit test view: nil, at point: \(point)")
+        }
+
+        // rootViewController?.view がヒットしても、子ビューがある場合は透過しない
+        if rootViewController?.view == view {
+            // 子ビューが存在する場合はタッチイベントを処理
+            if rootViewController?.view.subviews.contains(where: { $0.frame.contains(point) }) == true {
+                return view
+            }
+            print("Background was hit, passing through")
+            return nil
+        }
+
+        return view
     }
 }