Task関連追加、QR読み込み後処理修正

Seilassist/Sailassist/Login/LoginView.swift

@@ -51,7 +51,7 @@ struct LoginView: View {
                 
                 switch viewMode{
                 case .SelectType:
-                    LoginTypeSelectView(isQrRead: $isQrRead, viewMode: $viewMode)
+                    LoginTypeSelectView(isQrRead: $scannerViewModel.isShowing, viewMode: $viewMode)
                 case .InputIdPassword:
                     InputIdPassWordView(viewMode: $viewMode, param: $loginViewParam)
                 case .InputUserName:
@@ -77,8 +77,8 @@ struct LoginView: View {
                 .padding(.bottom, 30)
             }
         }
-        .fullScreenCover(isPresented: $isQrRead, content: {
-            QRReadView(viewMode: .constant(.SelectType))
+        .fullScreenCover(isPresented: $scannerViewModel.isShowing, content: {
+            QRReadView(viewMode: .constant(.SelectType), viewModel: scannerViewModel)
         })
     }
 }

Seilassist/Sailassist/Login/View/QRReadView.swift

@@ -9,18 +9,18 @@ import SwiftUI
 
 struct QRReadView: View {
     @Binding var viewMode: LoginViewMode
-    @ObservedObject private var viewModel = ScannerViewModel()
+    @ObservedObject var viewModel: ScannerViewModel
         
     var body: some View {
         //QR読み取りViewをセット：レイヤーにカメラプレビューのレイヤーをセット
         QrCodeScannerView()
             .found(r: self.viewModel.onFoundQrCode)
-            .torchLight(isOn: self.viewModel.isShowing)
+            .torchLight(isOn: false)
             .interval(delay: self.viewModel.scanInterval)
     }
 }
 
 
 #Preview {
-    QRReadView(viewMode: .constant(.SelectType))
+    QRReadView(viewMode: .constant(.SelectType), viewModel: ScannerViewModel())
 }

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

@@ -8,9 +8,41 @@
 import SwiftUI
 
 struct EcaSettingView: View {
+    
+//    @State var ecaArea: RegisteredEca = RegisteredEca(ecaName: "eca")!
     var body: some View {
         VStack{
             
+            VStack(alignment: .leading){
+                Text("Switching Finish - ECA")
+                    .foregroundColor(ColorSet.Body.color)
+
+                HStack{
+                    Text("17")
+                    Text("NM")
+                }
+                .foregroundColor(ColorSet.Body.color)
+                HStack{
+                    Button(action: {
+                        
+                    }, label: {
+                        Image(systemName: "minus.circle")
+                    })
+                    
+                    Slider(value: .constant(1))
+                    
+                    Button(action: {
+                        
+                    }, label: {
+                        Image(systemName: "plus.circle")
+                    })
+                }
+            }
+            
+            Divider()
+            
+            
+            
             Button(action: {
                 
             }, label: {
@@ -20,37 +52,11 @@ struct EcaSettingView: View {
             .background(ColorSet.PrimaryActiveIcon.color)
             .cornerRadius(30)
         }
-    }
-}
-
-struct EcaSettingAreaView: View {
-    var body: some View {
-        VStack{
-            Text("Switching Finish - ECA")
-            HStack{
-                Text("17")
-                Text("NM")
-            }
-            HStack{
-                Button(action: {
-                    
-                }, label: {
-                    /*@START_MENU_TOKEN@*/Text("Button")/*@END_MENU_TOKEN@*/
-                })
-                
-                Slider(value: .constant(1))
-                
-                Button(action: {
-                    
-                }, label: {
-                    /*@START_MENU_TOKEN@*/Text("Button")/*@END_MENU_TOKEN@*/
-                })
-            }
-        }
+        
+        .padding(.horizontal)
     }
 }
 
 #Preview {
-//    EcaSettingView()
-    EcaSettingAreaView()
+    EcaSettingView()
 }

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

@@ -11,11 +11,21 @@ enum TaskViewMode{
     case SwitchingMenu
     case EcaList
     case EcaSetting
+    
+    var title: String{
+        switch self{
+        case .SwitchingMenu:
+            "Fuel Switching"
+        case .EcaList:
+            "ECA List"
+        case .EcaSetting:
+            ""
+        }
+    }
 }
 
 
 struct MapTaskView: View {
-    @State private var contentTitle: String = "title"
     @State var viewMode: TaskViewMode = .SwitchingMenu
     var body: some View {
         VStack{
@@ -39,7 +49,7 @@ struct MapTaskView: View {
                 
                 Spacer()
                 
-                Text(contentTitle)
+                Text(viewMode.title)
                     .frame(height: 20)
                     .padding(.vertical, 14)
                 
@@ -76,6 +86,9 @@ struct MapTaskView: View {
             .padding(.leading, 20)
             .padding(.trailing, 10)
             
+            Spacer()
+                .frame(height: 100)
+            
         }.onAppear{
             EcaCoordinatesTable().setEcaData()
         }

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

@@ -13,25 +13,55 @@ struct TaskSwitchingMenuView: View {
     var body: some View {
         VStack{
             ForEach(sharingData.ecaArea.map{ $0.1 }.filter{ $0.isEnable }, id: \.name){ eca in
-                HStack {
-                    Circle()
-                        .frame(width: 10)
-                        .foregroundColor(eca.isRunning ? .red : .blue)
-                    
-                    Text(eca.name)
-                    
-                    Spacer()
-                    
-                    Button(action: {
-                        for running in sharingData.ecaArea.map{ $0.1 }.filter{ $0.isRunning }{
-                            running.isRunning = false
-                            sharingData.editEcaArea(key: running.name, value: running)
+                
+                VStack {
+                    HStack {
+                        Button {
+                            for running in sharingData.ecaArea.map{ $0.1 }.filter{ $0.isRunning }{
+                                running.isRunning = false
+                                sharingData.editEcaArea(key: running.name, value: running)
+                            }
+                            eca.isRunning = true
+                            sharingData.editEcaArea(key: eca.name, value: eca)
+                        } label: {
+                            Circle()
+                                .frame(width: 10)
+                                .foregroundColor(eca.isRunning ? .red : .blue)
+                            
+                            Text(eca.name)
+                                .foregroundColor(ColorSet.Body.color)
+                        }
+                        
+                        Spacer()
+                        
+                        
+                        
+                        Menu {
+                            Label{
+                                Text(eca.name)
+                            } icon: {
+                                Image("closeIcon")
+                            }
+                            
+                            Button{
+                                viewMode = .EcaSetting
+                            } label: {
+                                Text("Edit Notice Setting")
+                            }
+                            
+                            Button{
+                                
+                            } label: {
+                                Text("Delete ECA Task")
+                            }
+                        } label: {
+                            Image(systemName: "ellipsis")
                         }
-                        eca.isRunning = true
-                        sharingData.editEcaArea(key: eca.name, value: eca)
-                    }, label: {
-                        Text("Button")
-                    })
+                        .disabled(eca.isRunning)
+                    }
+                    .frame(height: 50)
+                    
+                    Divider()
                 }
             }
             
@@ -52,32 +82,6 @@ struct TaskSwitchingMenuView: View {
     }
 }
 
-struct TaskEcaView: View {
-    @Binding var data : RegisteredEca
-    @State var isPopover: Bool = false
-    var body: some View {
-        HStack {
-            Circle()
-                .frame(width: 10)
-            
-            Text(data.name)
-            
-            Spacer()
-            
-            Button(action: {
-                
-//                isPopover = true
-            }, label: {
-                /*@START_MENU_TOKEN@*/Text("Button")/*@END_MENU_TOKEN@*/
-            })
-            .popover(isPresented: $isPopover, content: {
-                Text("aaaa")
-            })
-        }
-        .padding()
-    }
-}
-
 
 #Preview {
     TaskSwitchingMenuView(viewMode: .constant(.SwitchingMenu))