iPad対応

Seilassist/Sailassist.xcodeproj/project.pbxproj

@@ -1242,7 +1242,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.6;
+				MARKETING_VERSION = 1.0.0;
 				OTHER_SWIFT_FLAGS = "-D CANARY -D COCOAPODS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jrc.sailassist.canary;
 				PRODUCT_NAME = "Sail Assist";
@@ -1285,7 +1285,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.6;
+				MARKETING_VERSION = 1.0.0;
 				OTHER_SWIFT_FLAGS = "-D COCOAPODS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jrc.sailassist;
 				PRODUCT_NAME = "Sail Assist";
@@ -1471,7 +1471,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.9.6;
+				MARKETING_VERSION = 1.0.0;
 				OTHER_SWIFT_FLAGS = "-D QC -D COCOAPODS";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jrc.sailassist.qc;
 				PRODUCT_NAME = "Sail Assist";

Seilassist/Sailassist/Map/Task/View/MapTaskView.swift

@@ -85,7 +85,7 @@ struct MapTaskView: View {
         .onAppear{
             let appVersionModel = AppVersionModel()
             appVersionModel.start()
-            EcaCoordinatesTable().setEcaData()
+//            EcaCoordinatesTable().setEcaData()
         }
         .alert("", isPresented: $eca.isShowEcaAlert) {
             if let ecaArea = eca.ecaArea.map({ $0.1 }).filter({ $0.isRunning }).first{

Seilassist/Sailassist/Tab/MainTabView.swift

@@ -31,37 +31,73 @@ struct MainTabView: View {
         appearance.backgroundColor = .clear
         UITabBar.appearance().scrollEdgeAppearance = appearance
         UITabBar.appearance().standardAppearance = appearance
+        EcaCoordinatesTable().setEcaData()
     }
-    
+
     var body: some View {
-        @State var isTabShow: Bool = sceneDelegate.tabWindow != nil
-        @State var isTaskSel: Bool = selectedTabModel.activeTab == .task
-        TabView(selection: $selectedTabModel.activeTab){
+        if UIDevice.current.userInterfaceIdiom == .phone {
+            @State var isTabShow: Bool = sceneDelegate.tabWindow != nil
+            @State var isTaskSel: Bool = selectedTabModel.activeTab == .task
+
+            TabView(selection: $selectedTabModel.activeTab){
 #if CANARY
-            ChatView()
-                .tag(Tab.chat)
+                ChatView()
+                    .tag(Tab.chat)
 #endif
-            MapRepresentable()
-                .ignoresSafeArea()
-                .tag(Tab.task)
-            
-            NotificationView()
-                .tag(Tab.alert)
-            
-            MenuView(isSignout: $isSignout)
-                .tag(Tab.menu)
+                MapRepresentable()
+                    .ignoresSafeArea()
+                    .tag(Tab.task)
+
+                NotificationView()
+                    .tag(Tab.alert)
+
+                MenuView(isSignout: $isSignout)
+                    .tag(Tab.menu)
+            }
+            .hideNativeTabBar()
+            .sheet(isPresented: .constant(isTaskSel && isTabShow), content: {
+                MapTaskView()
+                    .zIndex(0)
+                    .presentationDragIndicator(.hidden)
+                    .presentationDetents([.height(150), .medium, .fraction(0.99)])
+                    .presentationCornerRadius(15)
+                    .presentationBackgroundInteraction(.enabled(upThrough: .medium))
+                    .presentationBackground(ColorSet.BackgroundSecondary.color)
+                    .interactiveDismissDisabled()
+            })
+        } else if UIDevice.current.userInterfaceIdiom == .pad {
+            @State var isPopover: Bool = selectedTabModel.isPoppver
+
+            TabView(selection: $selectedTabModel.activeTab){
+#if CANARY
+                ChatView()
+                    .tag(Tab.chat)
+#endif
+                MapRepresentable()
+                    .ignoresSafeArea()
+                    .tag(Tab.task)
+
+                NotificationView()
+                    .tag(Tab.alert)
+
+                MenuView(isSignout: $isSignout)
+                    .tag(Tab.menu)
+            }
+            .hideNativeTabBar()
+            .popover(isPresented: .constant(isPopover), attachmentAnchor: .point(.bottom), arrowEdge: .bottom) {
+                MapTaskView()
+                    .presentationCompactAdaptation(.none)
+                    .zIndex(0)
+                    .presentationDragIndicator(.hidden)
+                    .frame(minWidth: 300, maxHeight: 500)
+//                    .frame(minWidth: 0, maxWidth: 300, minHeight: 0, maxHeight: 600, alignment: .center)
+//                    .aspectRatio(contentMode: .fit)
+                    .presentationCornerRadius(15)
+                    .presentationBackgroundInteraction(.enabled(upThrough: .medium))
+                    .presentationBackground(ColorSet.BackgroundSecondary.color)
+                    .interactiveDismissDisabled()
+            }
         }
-        .hideNativeTabBar()
-        .sheet(isPresented: .constant(isTaskSel && isTabShow), content: {
-            MapTaskView()
-            .zIndex(0)
-            .presentationDragIndicator(.hidden)
-            .presentationDetents([.height(150), .medium, .fraction(0.99)])
-            .presentationCornerRadius(15)
-            .presentationBackgroundInteraction(.enabled(upThrough: .medium))
-            .presentationBackground(ColorSet.BackgroundSecondary.color)
-            .interactiveDismissDisabled()
-        })
     }
 }
 
@@ -79,6 +115,11 @@ struct CustomTabBar: View {
                 ForEach(Tab.allCases, id: \.rawValue) { tab in
                     Button(action: {
                         selectedTabModel.activeTab = tab
+                        if tab == .task {
+                            selectedTabModel.isPoppver.toggle()
+                        } else {
+                            selectedTabModel.isPoppver = false
+                        }
                     }, label: {
                         VStack{
                             Image(selectedTabModel.activeTab == tab ? tab.rawValue + "_selected" : tab.rawValue)

Seilassist/Sailassist/Tab/ViewModel/SelectedTabModel.swift

@@ -12,4 +12,5 @@ class SelectedTabModel: ObservableObject {
     @Published var activeTab: Tab = .task
     @Published var isShowChangeEmrMode: Bool = false
     @Published var isLocationAlert: Bool = false
+    @Published var isPoppver: Bool = false
 }