From efdc20cb54de9ae29d907d1538f4879947e6e816 Mon Sep 17 00:00:00 2001
From: Gk40002148 <yamaguchi.yuudai@nttdata-sbc.co.jp>
Date: Mon, 18 Apr 2022 17:58:12 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=8F=E3=83=B3=E3=83=90=E3=83=BC=E3=82=AC?=
 =?UTF-8?q?=E3=83=BC=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AE=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD=E3=82=BF=E3=83=83=E3=83=97=E3=81=A7=E3=80=81=E3=83=A1?=
 =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92=E9=96=89=E3=81=98=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=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

---
 .../View/ProfileViewController.storyboard     | 10 ++++----
 .../View/MenuTableViewController.swift        |  4 +++
 .../WebView/View/MenuViewController.swift     | 25 +++++++++++--------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/AgileWorks/AgileWorks/Profile/View/ProfileViewController.storyboard b/AgileWorks/AgileWorks/Profile/View/ProfileViewController.storyboard
index 743a9f9..9827aeb 100644
--- a/AgileWorks/AgileWorks/Profile/View/ProfileViewController.storyboard
+++ b/AgileWorks/AgileWorks/Profile/View/ProfileViewController.storyboard
@@ -19,7 +19,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="osV-yf-fda" userLabel="Profile View">
-                                <rect key="frame" x="20.5" y="179" width="373" height="448"/>
+                                <rect key="frame" x="20.5" y="179" width="373" height="537.5"/>
                                 <subviews>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="person.fill" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="Ygf-MW-7gB">
                                         <rect key="frame" x="20" y="11.5" width="74.5" height="77"/>
@@ -35,13 +35,13 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="52L-Ef-mqO">
-                                        <rect key="frame" x="8" y="100" width="357" height="289"/>
+                                        <rect key="frame" x="8" y="100" width="357" height="378.5"/>
                                         <connections>
                                             <segue destination="hLK-HB-xlu" kind="embed" id="K4F-7l-7uW"/>
                                         </connections>
                                     </containerView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pr0-vG-AuG">
-                                        <rect key="frame" x="296" y="409" width="67" height="31"/>
+                                        <rect key="frame" x="296" y="498.5" width="67" height="31"/>
                                         <state key="normal" title="Button"/>
                                         <buttonConfiguration key="configuration" style="plain" title="閉じる"/>
                                         <connections>
@@ -70,7 +70,7 @@
                         <color key="backgroundColor" systemColor="tertiaryLabelColor"/>
                         <constraints>
                             <constraint firstItem="osV-yf-fda" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" constant="135" id="DqI-qt-WKH"/>
-                            <constraint firstItem="osV-yf-fda" firstAttribute="height" secondItem="5EZ-qb-Rvc" secondAttribute="height" multiplier="0.5" id="GOn-23-lSd"/>
+                            <constraint firstItem="osV-yf-fda" firstAttribute="height" secondItem="5EZ-qb-Rvc" secondAttribute="height" multiplier="0.6" id="GOn-23-lSd"/>
                             <constraint firstItem="osV-yf-fda" firstAttribute="width" secondItem="5EZ-qb-Rvc" secondAttribute="width" multiplier="0.9" id="f58-O7-sLk"/>
                             <constraint firstItem="osV-yf-fda" firstAttribute="centerX" secondItem="5EZ-qb-Rvc" secondAttribute="centerX" id="yaT-OO-gml"/>
                         </constraints>
@@ -89,7 +89,7 @@
             <objects>
                 <tableViewController id="hLK-HB-xlu" customClass="ProfileTableViewController" customModule="AgileWorks" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" id="0wF-MY-63g">
-                        <rect key="frame" x="0.0" y="0.0" width="357" height="289"/>
+                        <rect key="frame" x="0.0" y="0.0" width="357" height="378.5"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
diff --git a/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift b/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift
index 55d1e8b..a3ba955 100644
--- a/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/MenuTableViewController.swift
@@ -41,6 +41,10 @@ class MenuTableViewController: UITableViewController {
         } else if let staticIndexPath = tableView.indexPath(for: self.openLicenseCell), staticIndexPath == indexPath {
             self.pushToOpenLicense()
         }
+        // メニュークローズ
+        if let parent = self.parent as? MenuViewController {
+            parent.closeView()
+        }
     }
 
     // 各種セットアップ
diff --git a/AgileWorks/AgileWorks/WebView/View/MenuViewController.swift b/AgileWorks/AgileWorks/WebView/View/MenuViewController.swift
index 00b73b5..2cef853 100644
--- a/AgileWorks/AgileWorks/WebView/View/MenuViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/MenuViewController.swift
@@ -40,19 +40,24 @@ class MenuViewController: UIViewController {
         super.touchesEnded(touches, with: event)
         for touch in touches where touch.view?.tag == 1 {
             // メニューエリア外タップ時の処理
-            UIView.animate(
-                withDuration: 0.2,
-                delay: 0,
-                options: .curveEaseIn,
-                animations: {
-                    self.menuView.layer.position.x = -self.menuView.frame.width
-                },
-                completion: { _ in
-                    self.dismiss(animated: true, completion: nil)
-                })
+            self.closeView()
         }
     }
 
+    // MenuView クローズ
+    func closeView() {
+        UIView.animate(
+            withDuration: 0.2,
+            delay: 0,
+            options: .curveEaseIn,
+            animations: {
+                self.menuView.layer.position.x = -self.menuView.frame.width
+            },
+            completion: { _ in
+                self.dismiss(animated: true, completion: nil)
+            })
+    }
+
     // 各種セットアップ
     private func setup() {
         // セッション情報取得
-- 
GitLab