selim/AutoCat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug with hidden navigation bar

Browse Source
This commit is contained in:
Selim Mustafaev 2020-06-14 21:27:11 +03:00
parent 7b97df4b28
commit 088f932491
5 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AutoCat.xcodeproj/project.pbxproj
View File

@ -619,7 +619,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 13; CURRENT_PROJECT_VERSION = 14;
DEVELOPMENT_TEAM = 46DTTB8X4S; DEVELOPMENT_TEAM = 46DTTB8X4S;
INFOPLIST_FILE = AutoCat/Info.plist; INFOPLIST_FILE = AutoCat/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 13.0;
@ -641,7 +641,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 13; CURRENT_PROJECT_VERSION = 14;
DEVELOPMENT_TEAM = 46DTTB8X4S; DEVELOPMENT_TEAM = 46DTTB8X4S;
INFOPLIST_FILE = AutoCat/Info.plist; INFOPLIST_FILE = AutoCat/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 13.0;

16
AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -40,21 +40,5 @@
landmarkType = "7"> landmarkType = "7">
</BreakpointContent> </BreakpointContent>
</BreakpointProxy> </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> </Breakpoints>
</Bucket> </Bucket>

10
AutoCat/Base.lproj/Main.storyboard
View File

@ -165,7 +165,7 @@
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints> <constraints>
<constraint firstItem="rG3-ze-Zre" firstAttribute="trailing" secondItem="fbN-WR-iQY" secondAttribute="trailing" id="8JI-c0-3hf"/> <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="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"/> <constraint firstItem="rG3-ze-Zre" firstAttribute="leading" secondItem="fbN-WR-iQY" secondAttribute="leading" id="qo7-O7-zc7"/>
</constraints> </constraints>
@ -223,14 +223,14 @@
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<prototypes> <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"> <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"/> <autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VEP-QD-i6y" id="8hH-8I-XLB"> <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"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <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"> <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"/> <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
@ -242,7 +242,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cvf-vM-QnT" customClass="PlateView" customModule="AutoCat" customModuleProvider="target"> <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"/> <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="40" id="Xoz-Iw-PCU"/> <constraint firstAttribute="height" constant="40" id="Xoz-Iw-PCU"/>

1
AutoCat/Controllers/MainSplitController.swift
View File

@ -58,6 +58,7 @@ class MainSplitController: UISplitViewController, UISplitViewControllerDelegate
if let tabController = primaryViewController as? UITabBarController { if let tabController = primaryViewController as? UITabBarController {
let selectedNavController = tabController.selectedViewController as? UINavigationController let selectedNavController = tabController.selectedViewController as? UINavigationController
detail.hidesBottomBarWhenPushed = true detail.hidesBottomBarWhenPushed = true
selectedNavController?.setNavigationBarHidden(false, animated: false)
selectedNavController?.pushViewController(detail, animated: false) selectedNavController?.pushViewController(detail, animated: false)
return true return true
} }

6
AutoCat/Controllers/ReportController.swift
View File

@ -118,16 +118,12 @@ class ReportController: UIViewController, UICollectionViewDataSource, UICollecti
super.viewWillAppear(animated) super.viewWillAppear(animated)
guard let ad = UIApplication.shared.delegate as? AppDelegate else { return } 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 { if ad.quickAction == .check {
self.dismiss(animated: false, completion: nil) self.dismiss(animated: false, completion: nil)
} }
} }
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
}
// MARK: - UICollectionViewDataSource // MARK: - UICollectionViewDataSource