From 71196e0f57d012445532d93f967a17d6bb385211 Mon Sep 17 00:00:00 2001 From: Gk40002148 Date: Tue, 29 Mar 2022 15:04:56 +0900 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=81=8B=E3=82=89=E3=81=AE?= =?UTF-8?q?=E6=9B=B8=E9=A1=9E=E8=A1=A8=E7=A4=BA=E3=81=AB=E6=97=A2=E3=81=AB?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AB=E3=80=81=E4=B8=8A=E6=9B=B8=E3=81=8D?= =?UTF-8?q?=E7=A2=BA=E8=AA=8D=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83?= =?UTF-8?q?=E3=83=97=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Wireframe/MainTabBarViewWireframe.swift | 30 ++++++++++++++++++- .../Strings/Chinese-Simplified.strings | 3 ++ .../Strings/Chinese-Traditional.strings | 3 ++ AgileWorks/AgileWorks/Strings/English.strings | 3 ++ .../AgileWorks/Strings/Japanese.strings | 3 ++ .../Strings/en.lproj/Localizable.strings | 3 ++ .../Strings/ja.lproj/Localizable.strings | 3 ++ .../Strings/zh-Hans.lproj/Localizable.strings | 3 ++ .../Strings/zh-Hant.lproj/Localizable.strings | 3 ++ 9 files changed, 53 insertions(+), 1 deletion(-) diff --git a/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift b/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift index a3895cc..0f3d9aa 100644 --- a/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift +++ b/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift @@ -44,6 +44,7 @@ extension MainTabBarViewWireframeImpl: MainTabBarViewWireframe { } */ } + // 通知から書類表示 func showDocForm(notificationData: NotificationData) { let modalWebVC = WebViewBuilderImpl().buildVC() // URL , タイトル設定 @@ -52,6 +53,33 @@ extension MainTabBarViewWireframeImpl: MainTabBarViewWireframe { modalWebVC.showNotification = true let nav = UINavigationController(rootViewController: modalWebVC) nav.modalPresentationStyle = .fullScreen - self.viewController.present(nav, animated: true, completion: nil) + // 既にモーダルでViewが表示されているか。 + if let presentNavi = self.viewController.presentedViewController as? UINavigationController { + // されている場合、開き直しの確認 + showOverrideAlter(oldNavi: presentNavi, newNavi: nav) + } else { + // されていない場合、そのままモーダル表示 + self.viewController.present(nav, animated: true, completion: nil) + } + + } + + // 書類上書き確認アラート表示 + func showOverrideAlter(oldNavi: UINavigationController, newNavi: UINavigationController) { + // 開き直し確認 + let message = localizadString(key: "DocOverrideConfirm", comment: "") + // OK アクション設定 + let defaultAction = UIAlertAction(title: localizadString(key: "YES", comment: ""), style: .default) { _ in + // 今表示されている書類を閉じて、新たに開き直す + oldNavi.dismiss(animated: true, completion: nil) + self.viewController.present(newNavi, animated: true, completion: nil) + } + // キャンセルアクション設定 + let cancelAction = UIAlertAction(title: localizadString(key: "NO", comment: ""), style: .cancel) { _ in + // 何もしない + } + // アラート表示 + AppDelegate.shared.rootViewController.showAlertScreen(view: oldNavi, title: "", message: message, defaultAction: defaultAction, cancelAction: cancelAction) } + } diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings index aff780d..e2be977 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings @@ -56,6 +56,9 @@ // Open License "OpenLicenseViewTitle" = "开放许可证"; +// Notification +"DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか。"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings index 58f5810..1df73e1 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings @@ -56,6 +56,9 @@ // Open License "OpenLicenseViewTitle" = "開放許可證"; +// Notification +"DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか。"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/English.strings b/AgileWorks/AgileWorks/Strings/English.strings index 5d6317b..8abfea6 100644 --- a/AgileWorks/AgileWorks/Strings/English.strings +++ b/AgileWorks/AgileWorks/Strings/English.strings @@ -56,6 +56,9 @@ // Open License "OpenLicenseViewTitle" = "Open license"; +// Notification +"DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか。"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/Japanese.strings b/AgileWorks/AgileWorks/Strings/Japanese.strings index 8c8c1d0..61db032 100644 --- a/AgileWorks/AgileWorks/Strings/Japanese.strings +++ b/AgileWorks/AgileWorks/Strings/Japanese.strings @@ -56,6 +56,9 @@ // Open License "OpenLicenseViewTitle" = "オープンソースライセンス"; +// Notification +"DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか。"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings index 0fb1fd3..c185633 100644 --- a/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings @@ -56,6 +56,9 @@ // Open License "OpenLicenseViewTitle" = "Open license"; +// Notification +"DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか。"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings index aaea522..aa151b7 100644 --- a/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings @@ -56,6 +56,9 @@ // Open License "OpenLicenseViewTitle" = "オープンソースライセンス"; +// Notification +"DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか。"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings index 85862b0..463d57a 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings @@ -56,6 +56,9 @@ // Open License "OpenLicenseViewTitle" = "开放许可证"; +// Notification +"DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか。"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; diff --git a/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings index 4613b55..3abe001 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings @@ -56,6 +56,9 @@ // Open License "OpenLicenseViewTitle" = "開放許可證"; +// Notification +"DocOverrideConfirm" = "既に通知タップによる書類が表示されています。\n現在の編集内容を破棄し、新たな書類を表示しますか。"; + // Approval "ApprovalTitle" = "承認一覧"; "ApprovalData" = "%1$@ (%2$@)"; -- GitLab