QRコードでのログイン不具合修正（ユーザー名入力前にログインしていた）

Seilassist/Sailassist/Login/AboutAppView.swift

@@ -69,7 +69,7 @@ struct AboutAppView: View {
                 NavigationLink {
                     LocalWebView(policy: .constant(.TermsOfUse))
                 } label: {
-                    Text("Terms Of Use")
+                    Text("Terms of Use")
                         .font(FontStyle.EmphasisText.font)
                         .foregroundColor(ColorSet.Body.color)
 

Seilassist/Sailassist/Login/LoginView.swift

@@ -152,10 +152,12 @@ struct LoginView: View {
         loginViewParam.shipId = Preferences.Id
         loginViewParam.password = Preferences.Password
         loginViewParam.deviceid = Preferences.DeviceId
-        loginViewParam.userName = Preferences.UserName
+//        loginViewParam.userName = Preferences.UserName
 
-        let login = ReqLogin(Id: Preferences.Id, Password: Preferences.Password, DeviceId: Preferences.DeviceId, UserName: Preferences.UserName)
-        sessionLogin.RequestLogin(login, completion: responseQrLogin)
+        viewMode = .InputUserName
+        isProgressView = false
+//        let login = ReqLogin(Id: Preferences.Id, Password: Preferences.Password, DeviceId: Preferences.DeviceId, UserName: Preferences.UserName)
+//        sessionLogin.RequestLogin(login, completion: responseQrLogin)
     }
 
     func LoginCheck() -> () {

Seilassist/Sailassist/Menu/MenuView.swift

@@ -62,7 +62,7 @@ enum MenuPath: String, Hashable{
         case .Help:
             "Help"
         case .AboutApp:
-            "About this App"
+            "About This App"
         case .ContactUs:
             "Contact Us"
         case .SignOut:

Seilassist/Sailassist/Menu/View/MenuAboutAppView.swift

@@ -70,7 +70,7 @@ struct MenuAboutAppView: View {
                 NavigationLink {
                     LocalWebView(policy: .constant(.TermsOfUse))
                 } label: {
-                    Text("Terms Of Use")
+                    Text("Terms of Use")
                         .font(FontStyle.EmphasisText.font)
                         .foregroundColor(ColorSet.Body.color)
 

Seilassist/Sailassist/Menu/View/MenuManualECDISView.swift

@@ -37,15 +37,10 @@ struct MenuManualECDISView: View {
             Spacer()
         }
         .background(ColorSet.BackgroundPrimary.color)
-        .alert("delete", isPresented: $isAlert) {
-            Button(role: .destructive) {
-
-            } label: {
-                Text("delete")
-            }
-
+        .alert("Error", isPresented: $isAlert) {
+            Button("OK") {}
         } message: {
-            Text("eca delete")
+            Text("Network Error")
         }
     }
 }

Seilassist/Sailassist/Menu/View/MenuManualRADARView.swift

@@ -38,15 +38,10 @@ struct MenuManualRADARView: View {
             Spacer()
         }
         .background(ColorSet.BackgroundPrimary.color)
-        .alert("delete", isPresented: $isAlert) {
-            Button(role: .destructive) {
-
-            } label: {
-                Text("delete")
-            }
-
+        .alert("Error", isPresented: $isAlert) {
+            Button("OK") {}
         } message: {
-            Text("eca delete")
+            Text("Network Error")
         }
     }
 }

Seilassist/Sailassist/Menu/View/MenuManualView.swift

@@ -65,15 +65,10 @@ struct MenuManualView: View {
             Spacer()
         }
         .background(ColorSet.BackgroundPrimary.color)
-        .alert("delete", isPresented: $isAlert) {
-            Button(role: .destructive) {
-               
-            } label: {
-                Text("delete")
-            }
-
+        .alert("Error", isPresented: $isAlert) {
+            Button("OK") {}
         } message: {
-            Text("eca delete")
+            Text("Network Error")
         }
     }
 }