From e5304816ba3dee09a30ab54073f7a9360e397976 Mon Sep 17 00:00:00 2001 From: Azuma Kasumi Date: Mon, 6 Jun 2022 14:55:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=8A=E3=83=93=E3=82=B2=E3=83=BC?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=90=E3=83=BC=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=88=E3=83=AB=E3=81=AE=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main/Builder/MainTabBarViewBuilder.swift | 10 ++--- .../Wireframe/MainTabBarViewWireframe.swift | 2 +- .../WebView/View/WebViewController.swift | 37 ------------------- 3 files changed, 6 insertions(+), 43 deletions(-) diff --git a/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift b/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift index 8036bf9..75fc631 100644 --- a/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift +++ b/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift @@ -82,35 +82,35 @@ extension MainTabBarViewBuilderImpl { view.tabBarItem.image = createTabBarItem(imageName: BarItem.home.rawValue, color: normalColor) view.tabBarItem.selectedImage = createTabBarItem(imageName: SelectedBarItem.home.rawValue, color: selectedColor) viewVC.loadURL = createLoadUrl(urlPath: ViewURL.home.rawValue) - viewVC.naviTitle = getDisplayString(key: "HomeTitle", comment: "") + viewVC.navigationItem.title = getDisplayString(key: "HomeTitle", comment: "") viewVC.tabTitleKey = "HomeTitle" case ViewType.work.rawValue: view.tabBarItem.title = getDisplayString(key: "WorkTitle", comment: "") view.tabBarItem.image = createTabBarItem(imageName: BarItem.work.rawValue, color: normalColor) view.tabBarItem.selectedImage = createTabBarItem(imageName: SelectedBarItem.work.rawValue, color: selectedColor) viewVC.loadURL = createLoadUrl(urlPath: ViewURL.work.rawValue) - viewVC.naviTitle = getDisplayString(key: "WorkTitle", comment: "") + viewVC.navigationItem.title = getDisplayString(key: "WorkTitle", comment: "") viewVC.tabTitleKey = "WorkTitle" case ViewType.documents.rawValue: view.tabBarItem.title = getDisplayString(key: "DocumentsTitle", comment: "") view.tabBarItem.image = createTabBarItem(imageName: BarItem.documents.rawValue, color: normalColor) view.tabBarItem.selectedImage = createTabBarItem(imageName: SelectedBarItem.documents.rawValue, color: selectedColor) viewVC.loadURL = createLoadUrl(urlPath: ViewURL.documents.rawValue) - viewVC.naviTitle = getDisplayString(key: "DocumentsTitle", comment: "") + viewVC.navigationItem.title = getDisplayString(key: "DocumentsTitle", comment: "") viewVC.tabTitleKey = "DocumentsTitle" case ViewType.search.rawValue: view.tabBarItem.title = getDisplayString(key: "SearchTitle", comment: "") view.tabBarItem.image = createTabBarItem(imageName: BarItem.search.rawValue, color: normalColor) view.tabBarItem.selectedImage = createTabBarItem(imageName: SelectedBarItem.search.rawValue, color: selectedColor) viewVC.loadURL = createLoadUrl(urlPath: ViewURL.search.rawValue) - viewVC.naviTitle = getDisplayString(key: "SearchTitle", comment: "") + viewVC.navigationItem.title = getDisplayString(key: "SearchTitle", comment: "") viewVC.tabTitleKey = "SearchTitle" default: view.tabBarItem.title = getDisplayString(key: "HomeTitle", comment: "") view.tabBarItem.image = createTabBarItem(imageName: BarItem.home.rawValue, color: normalColor) view.tabBarItem.selectedImage = createTabBarItem(imageName: SelectedBarItem.home.rawValue, color: selectedColor) viewVC.loadURL = createLoadUrl(urlPath: ViewURL.home.rawValue) - viewVC.naviTitle = getDisplayString(key: "HomeTitle", comment: "") + viewVC.navigationItem.title = getDisplayString(key: "HomeTitle", comment: "") viewVC.tabTitleKey = "HomeTitle" } diff --git a/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift b/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift index cfeaf23..1ee5b97 100644 --- a/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift +++ b/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift @@ -69,7 +69,7 @@ extension MainTabBarViewWireframeImpl: MainTabBarViewWireframe { let modalWebVC = WebViewBuilderImpl().buildVC() // URL , タイトル設定 modalWebVC.loadURL = notificationData.url - modalWebVC.naviTitle = notificationData.title + modalWebVC.navigationItem.title = notificationData.title modalWebVC.showNotification = true let nav = UINavigationController(rootViewController: modalWebVC) nav.modalPresentationStyle = .fullScreen diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift index 629356c..d08595e 100644 --- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift +++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift @@ -22,7 +22,6 @@ class WebViewController: UIViewController { // 別ウインドウで開いたときの子ウインドウスタック var subViewStack = SubViewStack() var loadURL: String! - var naviTitle: String! var showNotification = false // UserAgent let kCustomUserAgent = "AwMobileApp Safari/605.1.15" @@ -34,20 +33,12 @@ class WebViewController: UIViewController { //widgetから新規タブを開く際のフラグ var openByWidget = false // 表示中タイトルキー - var nowTitleKey: String! var tabTitleKey: String! // 現在表示中のURL var nowURL: String! // 初期ロード完了フラグ var initLoadComp = false - // Title を設定する URL を定義 - var urlToTitle: [String: String] = [ - "Mobile#home": getDisplayString(key: "HomeTitle", comment: ""), - "Mobile#work": getDisplayString(key: "WorkTitle", comment: ""), - "Mobile#formSelection": getDisplayString(key: "DocumentsTitle", comment: ""), - "Mobile#agileWorksSearch": getDisplayString(key: "SearchTitle", comment: "") - ] // 書類表示時 URL let docUrl: [String] = ["Mobile#docDetail", "#docDetail"] @@ -80,7 +71,6 @@ class WebViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - self.navigationItem.title = naviTitle } // WebView セットアップ @@ -285,14 +275,6 @@ class WebViewController: UIViewController { if let url = change![NSKeyValueChangeKey.newKey] as? URL { let urlString: String = url.absoluteString self.nowURL = urlString - for (key, value) in self.urlToTitle { - if urlString.contains(key) { - // タイトルの再設定 - naviTitle = value - break - } - } - self.navigationItem.title = naviTitle DispatchQueue.main.async { // token チェック self.updateSession(isInit: false) @@ -374,25 +356,6 @@ class WebViewController: UIViewController { } //ログイン画面の固定文言表示 func setupFixedWording() { - urlToTitle = [ - "Mobile#home": getDisplayString(key: "HomeTitle", comment: ""), - "Mobile#work": getDisplayString(key: "WorkTitle", comment: ""), - "Mobile#formSelection": getDisplayString(key: "DocumentsTitle", comment: ""), - "Mobile#agileWorksSearch": getDisplayString(key: "SearchTitle", comment: "") - ] - if self.nowTitleKey != nil { - for (key, value) in urlToTitle { - if self.nowTitleKey.contains(key) { - // タイトルの再設定 - naviTitle = value - break - } - } - } else { - // タイトルの再設定 - naviTitle = getDisplayString(key: tabTitleKey, comment: "") - } - self.navigationItem.title = naviTitle disconnectLabel.text = getDisplayString(key: "DisconnectNetworkLabel", comment: "") checkConnectButton.setTitle(getDisplayString(key: "CheckConnectButton", comment: ""), for: .normal) } -- GitLab From 5c059662569a5ddcad2214327a098e0638d3778c Mon Sep 17 00:00:00 2001 From: Azuma Kasumi Date: Tue, 7 Jun 2022 16:09:26 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A8=80=E8=AA=9E=E5=88=87=E3=82=8A?= =?UTF-8?q?=E6=9B=BF=E3=81=88=E6=99=82=E3=81=AE=E3=83=8A=E3=83=93=E3=82=B2?= =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=90=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=88=E3=83=AB=E3=81=AE=E5=86=8D=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AgileWorks/AgileWorks/WebView/View/WebViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift index d08595e..811846b 100644 --- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift +++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift @@ -356,6 +356,7 @@ class WebViewController: UIViewController { } //ログイン画面の固定文言表示 func setupFixedWording() { + self.navigationItem.title = getDisplayString(key: tabTitleKey, comment: "") disconnectLabel.text = getDisplayString(key: "DisconnectNetworkLabel", comment: "") checkConnectButton.setTitle(getDisplayString(key: "CheckConnectButton", comment: ""), for: .normal) } -- GitLab