From e16f62e8ecfc05e8241f435988ada4f23ac3ca68 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Tue, 21 Jun 2022 12:55:39 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B8=E9=A1=9E=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E3=81=AE=E3=81=BF=E3=81=AE=E3=83=94=E3=83=B3?=
 =?UTF-8?q?=E3=83=81=E3=82=A4=E3=83=B3=E3=83=BB=E3=82=A2=E3=82=A6=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WebView/View/WebViewController.storyboard |  9 ++++++++
 .../WebView/View/WebViewController.swift      | 23 +++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard b/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard
index bca840b..a0bcdf1 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard
@@ -22,6 +22,10 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="45R-16-zHE" userLabel="Form View">
                                 <rect key="frame" x="0.0" y="88" width="414" height="774"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <gestureRecognizers/>
+                                <connections>
+                                    <outletCollection property="gestureRecognizers" destination="xcB-AM-Jwa" appends="YES" id="7n5-xf-NAs"/>
+                                </connections>
                             </view>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SDl-Pj-V4V" userLabel="Disabling View">
                                 <rect key="frame" x="0.0" y="88" width="414" height="774"/>
@@ -97,6 +101,11 @@
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+                <pinchGestureRecognizer id="xcB-AM-Jwa">
+                    <connections>
+                        <action selector="pinchView:" destination="Y6W-OH-hqX" id="shi-S7-pIi"/>
+                    </connections>
+                </pinchGestureRecognizer>
             </objects>
             <point key="canvasLocation" x="1871.0144927536232" y="78.348214285714278"/>
         </scene>
diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 995b398..1a25eb3 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -42,6 +42,26 @@ class WebViewController: UIViewController {
     // 書類表示時 URL
     let docUrl: [String] = ["Mobile#docDetail", "#docDetail"]
 
+    //書類表示 ピンチレベル
+    var pinchLevel: CGFloat = 1
+
+    @IBAction func pinchView(_ sender: UIPinchGestureRecognizer) {
+        print("ピンチ！")
+       // 拡大比率が1.5倍毎に拡大
+       if pinchLevel + 0.5 <= sender.scale {
+           pinchLevel += 0.5
+           mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-in\").click();", completionHandler: { (object, error) -> Void in
+               print(error)
+           })
+       }// 縮小比率が0.5倍毎に縮小
+       else if pinchLevel - 0.5 >= sender.scale {
+           pinchLevel -= 0.5
+           mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-out\").click();", completionHandler: { (object, error) -> Void in
+               print(error)
+           })
+       }
+
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -554,6 +574,9 @@ extension WebViewController: UIGestureRecognizerDelegate {
 
 extension WebViewController: UIScrollViewDelegate {
     func scrollViewWillBeginZooming(_ scrollView: UIScrollView, with view: UIView?) {
+        print("はじまったよ")
+        //ピンチ開始時はピンチレベルの初期化
+        pinchLevel = 1
         // ピンチイン・アウト無効化
         scrollView.pinchGestureRecognizer?.isEnabled = false
     }
-- 
GitLab


From 9c74bc67647c03888f535cd240fcad80d5a22f7b Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Tue, 28 Jun 2022 14:42:13 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B8=E9=A1=9E=E3=81=AE=E6=8B=A1?=
 =?UTF-8?q?=E5=A4=A7=E3=83=BB=E7=B8=AE=E5=B0=8F=E4=BF=AE=E6=AD=A3=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WebView/View/WebViewController.storyboard |  8 ----
 .../WebView/View/WebViewController.swift      | 42 +++++++++++--------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard b/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard
index a0bcdf1..19d9eca 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.storyboard
@@ -23,9 +23,6 @@
                                 <rect key="frame" x="0.0" y="88" width="414" height="774"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <gestureRecognizers/>
-                                <connections>
-                                    <outletCollection property="gestureRecognizers" destination="xcB-AM-Jwa" appends="YES" id="7n5-xf-NAs"/>
-                                </connections>
                             </view>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SDl-Pj-V4V" userLabel="Disabling View">
                                 <rect key="frame" x="0.0" y="88" width="414" height="774"/>
@@ -101,11 +98,6 @@
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-                <pinchGestureRecognizer id="xcB-AM-Jwa">
-                    <connections>
-                        <action selector="pinchView:" destination="Y6W-OH-hqX" id="shi-S7-pIi"/>
-                    </connections>
-                </pinchGestureRecognizer>
             </objects>
             <point key="canvasLocation" x="1871.0144927536232" y="78.348214285714278"/>
         </scene>
diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 1a25eb3..e7469de 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -45,23 +45,6 @@ class WebViewController: UIViewController {
     //書類表示 ピンチレベル
     var pinchLevel: CGFloat = 1
 
-    @IBAction func pinchView(_ sender: UIPinchGestureRecognizer) {
-        print("ピンチ！")
-       // 拡大比率が1.5倍毎に拡大
-       if pinchLevel + 0.5 <= sender.scale {
-           pinchLevel += 0.5
-           mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-in\").click();", completionHandler: { (object, error) -> Void in
-               print(error)
-           })
-       }// 縮小比率が0.5倍毎に縮小
-       else if pinchLevel - 0.5 >= sender.scale {
-           pinchLevel -= 0.5
-           mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-out\").click();", completionHandler: { (object, error) -> Void in
-               print(error)
-           })
-       }
-
-    }
     override func viewDidLoad() {
         super.viewDidLoad()
 
@@ -87,6 +70,26 @@ class WebViewController: UIViewController {
         // ネットワークオフラインView関連セットアップ
         self.setDisconnectView()
         self.startNetworkMonitor()
+
+        //書類表示時のピンチイン・アウト
+        let pinch = UIPinchGestureRecognizer(target: self, action: #selector(self.pinchHandler))
+        pinch.delegate = self
+        self.view.addGestureRecognizer(pinch)
+    }
+
+    //書類表示時のピンチイン・アウト処理
+    @objc func pinchHandler(_ gesture: UIPinchGestureRecognizer) {
+       // 拡大比率が1.5倍毎に拡大
+       if pinchLevel + 0.5 <= gesture.scale {
+           pinchLevel += 0.5
+           mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-in\").click();", completionHandler: { (_, _) -> Void in
+           })
+       }// 縮小比率が0.5倍毎に縮小
+       else if pinchLevel - 0.5 >= gesture.scale {
+           pinchLevel -= 0.5
+           mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-out\").click();", completionHandler: { (_, _) -> Void in
+           })
+       }
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -570,11 +573,14 @@ extension WebViewController: UIGestureRecognizerDelegate {
     func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
         return true
     }
+    
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+            return true
+        }
 }
 
 extension WebViewController: UIScrollViewDelegate {
     func scrollViewWillBeginZooming(_ scrollView: UIScrollView, with view: UIView?) {
-        print("はじまったよ")
         //ピンチ開始時はピンチレベルの初期化
         pinchLevel = 1
         // ピンチイン・アウト無効化
-- 
GitLab


From b1f4e317176db1ec8bb2cef5eebff5efa4ea77e4 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Mon, 11 Jul 2022 18:13:54 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=E6=8B=A1=E5=A4=A7=E3=83=BB=E7=B8=AE?=
 =?UTF-8?q?=E5=B0=8F=E6=AF=94=E7=8E=87=E3=81=AE=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgileWorks/WebView/View/WebViewController.swift   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index e7469de..58e8f5d 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -79,14 +79,17 @@ class WebViewController: UIViewController {
 
     //書類表示時のピンチイン・アウト処理
     @objc func pinchHandler(_ gesture: UIPinchGestureRecognizer) {
+        //拡大・縮小比率
+        let pinchRatio = 0.2
+        
        // 拡大比率が1.5倍毎に拡大
-       if pinchLevel + 0.5 <= gesture.scale {
-           pinchLevel += 0.5
+       if pinchLevel + pinchRatio <= gesture.scale {
+           pinchLevel += pinchRatio
            mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-in\").click();", completionHandler: { (_, _) -> Void in
            })
        }// 縮小比率が0.5倍毎に縮小
-       else if pinchLevel - 0.5 >= gesture.scale {
-           pinchLevel -= 0.5
+       else if pinchLevel - pinchRatio >= gesture.scale {
+           pinchLevel -= pinchRatio
            mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-out\").click();", completionHandler: { (_, _) -> Void in
            })
        }
-- 
GitLab


From c5fe4fd567b67a015296be2d78855178117a8ea3 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Thu, 14 Jul 2022 11:10:22 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=E3=83=94=E3=83=B3=E3=83=81=E3=83=AC?=
 =?UTF-8?q?=E3=83=99=E3=83=AB=E3=81=AE=E5=88=9D=E6=9C=9F=E5=8C=96=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgileWorks/WebView/View/WebViewController.swift       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 58e8f5d..24c89ff 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -76,7 +76,7 @@ class WebViewController: UIViewController {
         pinch.delegate = self
         self.view.addGestureRecognizer(pinch)
     }
-
+    
     //書類表示時のピンチイン・アウト処理
     @objc func pinchHandler(_ gesture: UIPinchGestureRecognizer) {
         //拡大・縮小比率
@@ -574,9 +574,11 @@ extension WebViewController: SubViewStackEventDelegate {
 extension WebViewController: UIGestureRecognizerDelegate {
     // WebViewでのタップイベントを有効化
     func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+        //ピンチ開始時はピンチレベルの初期化
+        pinchLevel = 1
         return true
     }
-    
+
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
             return true
         }
@@ -584,8 +586,6 @@ extension WebViewController: UIGestureRecognizerDelegate {
 
 extension WebViewController: UIScrollViewDelegate {
     func scrollViewWillBeginZooming(_ scrollView: UIScrollView, with view: UIView?) {
-        //ピンチ開始時はピンチレベルの初期化
-        pinchLevel = 1
         // ピンチイン・アウト無効化
         scrollView.pinchGestureRecognizer?.isEnabled = false
     }
-- 
GitLab


From 6db4c0ad8b07b5b4666f9db71747fdae9d25e57d Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Thu, 14 Jul 2022 17:19:41 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AgileWorks/AgileWorks/WebView/View/WebViewController.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 24c89ff..676bc2f 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -82,12 +82,12 @@ class WebViewController: UIViewController {
         //拡大・縮小比率
         let pinchRatio = 0.2
         
-       // 拡大比率が1.5倍毎に拡大
+       // 拡大
        if pinchLevel + pinchRatio <= gesture.scale {
            pinchLevel += pinchRatio
            mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-in\").click();", completionHandler: { (_, _) -> Void in
            })
-       }// 縮小比率が0.5倍毎に縮小
+       }// 縮小
        else if pinchLevel - pinchRatio >= gesture.scale {
            pinchLevel -= pinchRatio
            mainWebView.evaluateJavaScript("document.getElementById(\"mobile-zoom-out\").click();", completionHandler: { (_, _) -> Void in
-- 
GitLab