Fix constraints issues on L0 Cells

ijerryhale · Jun 14, 2018 · 49723fb · 49723fb
1 parent 6bfadc9
commit 49723fb
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 38 deletions.
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/jhale.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/jhale.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/movies/Base.lproj/Main.storyboard b/movies/Base.lproj/Main.storyboard
@@ -217,7 +217,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Run Time:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="loh-vg-4U3" customClass="LabelPadded" customModule="movies" customModuleProvider="target">
-                                <rect key="frame" x="103" y="95" width="100" height="16"/>
+                                <rect key="frame" x="102" y="95" width="100" height="16"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" name="ArialMT" family="Arial" pointSize="14"/>
                                 <nil key="textColor"/>
@@ -247,7 +247,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Release Date:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EDJ-Ex-TBt" customClass="LabelPadded" customModule="movies" customModuleProvider="target">
-                                <rect key="frame" x="103" y="75" width="100" height="16"/>
+                                <rect key="frame" x="102" y="75" width="100" height="16"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" name="ArialMT" family="Arial" pointSize="14"/>
                                 <nil key="textColor"/>
@@ -280,7 +280,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" semanticContentAttribute="forceRightToLeft" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" reversesTitleShadowWhenHighlighted="YES" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="E2B-g2-ot5" userLabel="View In iTunes">
-                                <rect key="frame" x="105" y="48" width="137" height="22"/>
+                                <rect key="frame" x="104" y="48" width="137" height="22"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                 <state key="normal" title="iTunes Preview " image="gotoarrow">
@@ -344,7 +344,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Rating" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wgS-hl-6PZ">
-                                <rect key="frame" x="307" y="4" width="47" height="20"/>
+                                <rect key="frame" x="306" y="4" width="47" height="20"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <nil key="textColor"/>
@@ -456,7 +456,7 @@
                                 </connections>
                             </button>
                             <slider opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="pwK-Np-gDS">
-                                <rect key="frame" x="153" y="284" width="204" height="31"/>
+                                <rect key="frame" x="152" y="284" width="204" height="31"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <connections>
                                     <action selector="sliderDidChange:" destination="bOL-p8-veW" eventType="valueChanged" id="bzL-Dd-5g8"/>
@@ -468,7 +468,7 @@
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                                 <integer key="value" value="3"/>
                             </userDefinedRuntimeAttribute>
-                            <userDefinedRuntimeAttribute type="number" keyPath="borderWidht">
+                            <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                 <integer key="value" value="1"/>
                             </userDefinedRuntimeAttribute>
                             <userDefinedRuntimeAttribute type="nil" keyPath="borderColor"/>
@@ -512,7 +512,7 @@
                                 </connections>
                             </button>
                             <label autoresizesSubviews="NO" opaque="NO" userInteractionEnabled="NO" contentMode="top" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EOU-Yv-0Dj">
-                                <rect key="frame" x="70" y="134" width="214" height="107"/>
+                                <rect key="frame" x="69" y="134" width="214" height="107"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <nil key="textColor"/>
@@ -527,7 +527,7 @@
                                 </state>
                             </button>
                             <view autoresizesSubviews="NO" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0TS-Ir-nTl" customClass="UIImageView">
-                                <rect key="frame" x="94" y="14" width="166" height="105"/>
+                                <rect key="frame" x="93" y="14" width="166" height="105"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ihD-C7-c5c">

diff --git a/movies/Resource/CustomCell/L0_Cell.swift b/movies/Resource/CustomCell/L0_Cell.swift
@@ -17,7 +17,6 @@ class L0_Cell: UITableViewHeaderFooterView
 {
 	let disclosureButton = UIButton()
 	let backgroundview = UIView()
-
 	var delegate: SectionHeaderDelegate?
     var section: Int = 0
 
@@ -26,31 +25,28 @@ class L0_Cell: UITableViewHeaderFooterView
     override init(reuseIdentifier: String?)
     { super.init(reuseIdentifier: reuseIdentifier)
 
-        let marginGuide = contentView.layoutMarginsGuide
-
 		contentView.backgroundColor = UIColor.clear
-	backgroundview.setBorderColor(UIColor.themeColor(THEME_COLOR))
+		
 		backgroundview.setCornerRadius(3)
-		backgroundview.setBorderWidth(1)
 		backgroundview.backgroundColor = UIColor.themeColor(THEME_COLOR)
-
-		contentView.addSubview(backgroundview)
 
+		contentView.addSubview(backgroundview)
+
 		backgroundview.translatesAutoresizingMaskIntoConstraints = false
-		backgroundview.leftAnchor.constraint(equalTo: marginGuide.leftAnchor, constant:-11).isActive = true
-		backgroundview.rightAnchor.constraint(equalTo: marginGuide.rightAnchor, constant:11).isActive = true
-		backgroundview.topAnchor.constraint(equalTo: marginGuide.topAnchor, constant:-6).isActive = true
-		backgroundview.bottomAnchor.constraint(equalTo: marginGuide.bottomAnchor, constant:6).isActive = true
+		backgroundview.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant: 4).isActive = true
+		backgroundview.widthAnchor.constraint(equalTo: contentView.widthAnchor, multiplier: 0.98).isActive = true
 
+		backgroundview.topAnchor.constraint(equalTo: contentView.topAnchor, constant: 2).isActive = true
+		backgroundview.heightAnchor.constraint(equalTo: contentView.heightAnchor, multiplier: 0.92).isActive = true
+
         disclosureButton.setImage(UIImage(named: "carat.png"), for: UIControlState.normal)
 		disclosureButton.setImage(UIImage(named: "carat-open.png"), for: UIControlState.selected)
 
         contentView.addSubview(disclosureButton)
 
         disclosureButton.translatesAutoresizingMaskIntoConstraints = false
-        disclosureButton.widthAnchor.constraint(equalToConstant: 26).isActive = true
-        disclosureButton.topAnchor.constraint(equalTo: marginGuide.topAnchor, constant:4).isActive = true
-		disclosureButton.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant:4).isActive = true
+		disclosureButton.centerYAnchor.constraint(equalTo: contentView.centerYAnchor).isActive = true
+		disclosureButton.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant:12).isActive = true
 
 		disclosureButton.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(L0_Cell.tapExpandCollapse(_:))))
 

diff --git a/movies/Resource/CustomCell/L0_Cell_movie.swift b/movies/Resource/CustomCell/L0_Cell_movie.swift
@@ -18,7 +18,6 @@ class L0_Cell_movie: L0_Cell
     override init(reuseIdentifier: String?)
     { super.init(reuseIdentifier: reuseIdentifier)
 
-		let marginGuide = contentView.layoutMarginsGuide
 		let red = CGFloat((0x333333 & 0xFF0000) >> 16) / 255.0
 		let green = CGFloat((0x333333 & 0x00FF00) >> 8) / 255.0
 		let blue = CGFloat(0x333333 & 0x00FF) / 255.0
@@ -32,13 +31,13 @@ class L0_Cell_movie: L0_Cell
 
         contentView.addSubview(title)
 
-		title.topAnchor.constraint(equalTo: marginGuide.topAnchor, constant:6).isActive = true
-		title.leftAnchor.constraint(equalTo: marginGuide.leftAnchor, constant:10).isActive = true
-		title.rightAnchor.constraint(equalTo: marginGuide.rightAnchor, constant:-20).isActive = true
-
+		title.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant:28).isActive = true
+		title.widthAnchor.constraint(equalTo: contentView.widthAnchor, multiplier: 0.81).isActive = true
+		title.centerYAnchor.constraint(equalTo: contentView.centerYAnchor).isActive = true
+	
 		title.isUserInteractionEnabled = true
 		title.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(L0_Cell.tapExpandCollapse(_:))))
-
+ 
 		rating.font = UIFont(name: "Arial", size: 14)
 		rating.textColor = UIColor(red: red, green: green, blue: blue, alpha: 1.0)
 
@@ -47,10 +46,13 @@ class L0_Cell_movie: L0_Cell
 
         contentView.addSubview(rating)
 
-		rating.topAnchor.constraint(equalTo: marginGuide.topAnchor, constant:8).isActive = true
+		rating.centerYAnchor.constraint(equalTo: contentView.centerYAnchor).isActive = true
 		rating.rightAnchor.constraint(equalTo: contentView.rightAnchor, constant:-8).isActive = true
+
 		rating.isUserInteractionEnabled = true
 
 		rating.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(L0_Cell.tapExpandCollapse(_:))))
-    }
+
+
+   }
 }
diff --git a/movies/Resource/CustomCell/L0_Cell_theater.swift b/movies/Resource/CustomCell/L0_Cell_theater.swift
@@ -19,7 +19,6 @@ class L0_Cell_theater: L0_Cell
     override init(reuseIdentifier: String?)
     { super.init(reuseIdentifier: reuseIdentifier)
 
-		let marginGuide = contentView.layoutMarginsGuide
 		let red = CGFloat((0x333333 & 0xFF0000) >> 16) / 255.0
 		let green = CGFloat((0x333333 & 0x00FF00) >> 8) / 255.0
 		let blue = CGFloat(0x333333 & 0x00FF) / 255.0
@@ -39,14 +38,16 @@ class L0_Cell_theater: L0_Cell
 		name.translatesAutoresizingMaskIntoConstraints = false
 		name.textAlignment = .left
 		name.lineBreakMode = .byTruncatingMiddle
-		name.isUserInteractionEnabled = true
-		name.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(L0_Cell.tapExpandCollapse(_:))))
 
         contentView.addSubview(name)
 
-		name.topAnchor.constraint(equalTo: marginGuide.topAnchor, constant:6).isActive = true
 		name.leftAnchor.constraint(equalTo: contentView.leftAnchor, constant:28).isActive = true
-
+		name.widthAnchor.constraint(equalTo: contentView.widthAnchor, multiplier: 0.68).isActive = true
+		name.centerYAnchor.constraint(equalTo: contentView.centerYAnchor).isActive = true
+
+		name.isUserInteractionEnabled = true
+		name.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(L0_Cell.tapExpandCollapse(_:))))
+
 		distance.font = UIFont(name: "Arial", size: 14)
 		distance.textColor = UIColor(red: red, green: green, blue: blue, alpha: 1.0)
 
@@ -55,7 +56,7 @@ class L0_Cell_theater: L0_Cell
 
         contentView.addSubview(distance)
 
-		distance.topAnchor.constraint(equalTo: marginGuide.topAnchor, constant:8).isActive = true
+		distance.centerYAnchor.constraint(equalTo: contentView.centerYAnchor).isActive = true
 		distance.rightAnchor.constraint(equalTo: contentView.rightAnchor, constant:-8).isActive = true
 
 		distance.isUserInteractionEnabled = true

diff --git a/movies/movies.plist b/movies/movies.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BUILD_TAG</key>
-	<string>0_9_00BF</string>
+	<string>0_9_00C0</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>191</string>
+	<string>192</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>