From 088f93249125713e060b2feaa140516b1f89381c Mon Sep 17 00:00:00 2001
From: Selim Mustafaev <selim@zuzex.com>
Date: Sun, 14 Jun 2020 21:27:11 +0300
Subject: [PATCH] Fixed bug with hidden navigation bar

---
 AutoCat.xcodeproj/project.pbxproj                |  4 ++--
 .../xcdebugger/Breakpoints_v2.xcbkptlist         | 16 ----------------
 AutoCat/Base.lproj/Main.storyboard               | 10 +++++-----
 AutoCat/Controllers/MainSplitController.swift    |  1 +
 AutoCat/Controllers/ReportController.swift       |  6 +-----
 5 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj
index fb33cdd..8be4e89 100644
--- a/AutoCat.xcodeproj/project.pbxproj
+++ b/AutoCat.xcodeproj/project.pbxproj
@@ -619,7 +619,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = 46DTTB8X4S;
 				INFOPLIST_FILE = AutoCat/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@@ -641,7 +641,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = 46DTTB8X4S;
 				INFOPLIST_FILE = AutoCat/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
diff --git a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index ca176d8..4faad41 100644
--- a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -40,21 +40,5 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "A414E864-679F-4B00-A2DE-6CE024EDCC5C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "AutoCat/Controllers/ReportController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "407"
-            endingLineNumber = "407"
-            landmarkName = "onShare(_:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/AutoCat/Base.lproj/Main.storyboard b/AutoCat/Base.lproj/Main.storyboard
index 277d826..932f211 100644
--- a/AutoCat/Base.lproj/Main.storyboard
+++ b/AutoCat/Base.lproj/Main.storyboard
@@ -165,7 +165,7 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
                             <constraint firstItem="rG3-ze-Zre" firstAttribute="trailing" secondItem="fbN-WR-iQY" secondAttribute="trailing" id="8JI-c0-3hf"/>
-                            <constraint firstItem="rG3-ze-Zre" firstAttribute="bottom" secondItem="fbN-WR-iQY" secondAttribute="bottom" id="ZCY-XN-Awz"/>
+                            <constraint firstItem="rG3-ze-Zre" firstAttribute="bottom" secondItem="u3u-z2-y6J" secondAttribute="bottom" id="ZCY-XN-Awz"/>
                             <constraint firstItem="rG3-ze-Zre" firstAttribute="top" secondItem="fbN-WR-iQY" secondAttribute="top" id="nqG-ez-Kjm"/>
                             <constraint firstItem="rG3-ze-Zre" firstAttribute="leading" secondItem="fbN-WR-iQY" secondAttribute="leading" id="qo7-O7-zc7"/>
                         </constraints>
@@ -223,14 +223,14 @@
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="VehicleCell" id="VEP-QD-i6y" customClass="VehicleCell" customModule="AutoCat" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="28" width="375" height="85.5"/>
+                                        <rect key="frame" x="0.0" y="28" width="375" height="85"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VEP-QD-i6y" id="8hH-8I-XLB">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="85.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="85"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Kia (JF) Optima" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AQY-7N-q8D">
-                                                    <rect key="frame" x="8" y="8" width="124" height="21.5"/>
+                                                    <rect key="frame" x="8" y="8" width="124" height="21"/>
                                                     <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -242,7 +242,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cvf-vM-QnT" customClass="PlateView" customModule="AutoCat" customModuleProvider="target">
-                                                    <rect key="frame" x="8" y="37.5" width="317" height="40"/>
+                                                    <rect key="frame" x="8" y="37" width="317" height="40"/>
                                                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="40" id="Xoz-Iw-PCU"/>
diff --git a/AutoCat/Controllers/MainSplitController.swift b/AutoCat/Controllers/MainSplitController.swift
index 0297003..0cf1b20 100644
--- a/AutoCat/Controllers/MainSplitController.swift
+++ b/AutoCat/Controllers/MainSplitController.swift
@@ -58,6 +58,7 @@ class MainSplitController: UISplitViewController, UISplitViewControllerDelegate
         if let tabController = primaryViewController as? UITabBarController {
             let selectedNavController = tabController.selectedViewController as? UINavigationController
             detail.hidesBottomBarWhenPushed = true
+            selectedNavController?.setNavigationBarHidden(false, animated: false)
             selectedNavController?.pushViewController(detail, animated: false)
             return true
         }
diff --git a/AutoCat/Controllers/ReportController.swift b/AutoCat/Controllers/ReportController.swift
index f3d7114..3b4abae 100644
--- a/AutoCat/Controllers/ReportController.swift
+++ b/AutoCat/Controllers/ReportController.swift
@@ -118,16 +118,12 @@ class ReportController: UIViewController, UICollectionViewDataSource, UICollecti
         super.viewWillAppear(animated)
         guard let ad = UIApplication.shared.delegate as? AppDelegate else { return }
         
-        self.navigationController?.setNavigationBarHidden(self.vehicle == nil, animated: false)
+        self.navigationController?.setNavigationBarHidden(self.vehicle == nil, animated: animated)
         
         if ad.quickAction == .check {
             self.dismiss(animated: false, completion: nil)
         }
     }
-    
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-    }
 
     // MARK: - UICollectionViewDataSource