Add back gesture [#65]

mindgarden-app · Apr 4, 2020 · 2265ab8 · 2265ab8
1 parent f1bb846
commit 2265ab8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 0 deletions.
diff --git a/.Podfile.swp b/.Podfile.swp
diff --git a/MindGarden/Resources/Storyboards/Auth.storyboard b/MindGarden/Resources/Storyboards/Auth.storyboard
@@ -71,6 +71,7 @@
                             <constraint firstItem="Eeo-vs-Qkh" firstAttribute="trailing" secondItem="f97-gM-uCP" secondAttribute="trailing" constant="162" id="Sdn-sw-flB"/>
                             <constraint firstItem="f97-gM-uCP" firstAttribute="leading" secondItem="Eeo-vs-Qkh" secondAttribute="leading" constant="161" id="XAz-ko-zYd"/>
                             <constraint firstItem="MGH-0h-ZBE" firstAttribute="leading" secondItem="Eeo-vs-Qkh" secondAttribute="leading" constant="21" id="Xa2-hx-okX"/>
+                            <constraint firstItem="0IH-rl-sDu" firstAttribute="width" secondItem="CNg-xW-Bik" secondAttribute="width" id="bee-XP-GHq"/>
                             <constraint firstItem="MGH-0h-ZBE" firstAttribute="centerX" secondItem="Eeo-vs-Qkh" secondAttribute="centerX" id="bhx-mj-jmt"/>
                             <constraint firstItem="Eeo-vs-Qkh" firstAttribute="trailing" secondItem="EWV-rU-jIe" secondAttribute="trailing" constant="37" id="eA6-ZG-hwV"/>
                             <constraint firstItem="f97-gM-uCP" firstAttribute="top" secondItem="EWV-rU-jIe" secondAttribute="bottom" constant="7" id="eba-xC-hjk"/>

diff --git a/MindGarden/Sources/ViewControllers/Diary/DiaryListVC.swift b/MindGarden/Sources/ViewControllers/Diary/DiaryListVC.swift
@@ -162,6 +162,9 @@ class DiaryListVC: UIViewController {
         dateBtn.setTitleColor(.black, for: .normal)
         dateBtn.addTarget(self, action: #selector(dateBtnAction), for: .touchUpInside)
         self.navigationItem.titleView = dateBtn
+
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
+        navigationController?.interactivePopGestureRecognizer?.delegate = nil
     }
 
     @objc func dateBtnAction() {

diff --git a/MindGarden/Sources/ViewControllers/Main/MainGridVC.swift b/MindGarden/Sources/ViewControllers/Main/MainGridVC.swift
@@ -37,6 +37,8 @@ class MainGridVC: UIViewController {
         super.viewDidLoad()
 
         self.navigationController?.interactivePopGestureRecognizer?.delegate = self
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
+        navigationController?.interactivePopGestureRecognizer?.delegate = nil
 
         getGardenData()
         setWaterview()

diff --git a/MindGarden/Sources/ViewControllers/Settings/SettingsVC.swift b/MindGarden/Sources/ViewControllers/Settings/SettingsVC.swift
@@ -34,6 +34,8 @@ class SettingsVC: UIViewController {
         self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.darkGray]
         navigationController?.isNavigationBarHidden = false
         self.navigationController?.interactivePopGestureRecognizer?.delegate = self
+        navigationController?.interactivePopGestureRecognizer?.isEnabled = true
+        navigationController?.interactivePopGestureRecognizer?.delegate = nil
     }
 
     func registerTVC() {