From 952e31098291b6f4675886d1951374d5004d0e9e Mon Sep 17 00:00:00 2001
From: Chris Li <shuowei.li@kmkconsultinginc.com>
Date: Wed, 29 Jun 2016 16:36:04 -0400
Subject: [PATCH] finished!

finish recent search bar shadow & background transition when hSizeClass
change
---
 Kiwix-iOS/Info.plist                   |  2 +-
 Kiwix-iOS/Storyboard/Search.storyboard | 12 +++++---
 Kiwix-iOS/View/ShadowView.swift        | 39 ++++++++++++++++++++++++--
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index 8b3f8477..d525c818 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -36,7 +36,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>849</string>
+	<string>878</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Kiwix-iOS/Storyboard/Search.storyboard b/Kiwix-iOS/Storyboard/Search.storyboard
index 2e76f997..0d276a78 100644
--- a/Kiwix-iOS/Storyboard/Search.storyboard
+++ b/Kiwix-iOS/Storyboard/Search.storyboard
@@ -75,7 +75,9 @@
                             <constraint firstItem="l6w-E8-vrr" firstAttribute="centerX" secondItem="anA-WQ-694" secondAttribute="centerX" id="10b-5k-B8a"/>
                             <constraint firstItem="wyO-bR-owd" firstAttribute="centerX" secondItem="anA-WQ-694" secondAttribute="centerX" id="2D4-7f-Usz"/>
                             <constraint firstItem="l6w-E8-vrr" firstAttribute="leading" secondItem="anA-WQ-694" secondAttribute="leading" id="3Hc-So-OgY"/>
-                            <constraint firstItem="M3E-Ei-iG0" firstAttribute="top" secondItem="l6w-E8-vrr" secondAttribute="bottom" priority="750" constant="100" id="3Ye-Dy-tJA"/>
+                            <constraint firstItem="M3E-Ei-iG0" firstAttribute="top" secondItem="l6w-E8-vrr" secondAttribute="bottom" priority="750" constant="100" id="3Ye-Dy-tJA">
+                                <variation key="widthClass=regular" constant="50"/>
+                            </constraint>
                             <constraint firstAttribute="trailingMargin" secondItem="l6w-E8-vrr" secondAttribute="trailing" constant="-20" id="4DW-to-Vk5"/>
                             <constraint firstItem="l6w-E8-vrr" firstAttribute="centerX" secondItem="anA-WQ-694" secondAttribute="centerX" id="5Mc-cX-eMg"/>
                             <constraint firstAttribute="trailing" secondItem="wyO-bR-owd" secondAttribute="trailing" id="8yE-Hw-hmZ"/>
@@ -112,7 +114,9 @@
                             </constraint>
                             <constraint firstItem="M3E-Ei-iG0" firstAttribute="top" secondItem="wyO-bR-owd" secondAttribute="bottom" id="i5e-7F-ctC"/>
                             <constraint firstItem="vCx-YB-CHS" firstAttribute="width" secondItem="wyO-bR-owd" secondAttribute="width" id="itt-a3-Qgu"/>
-                            <constraint firstItem="M3E-Ei-iG0" firstAttribute="top" secondItem="wyO-bR-owd" secondAttribute="bottom" priority="750" constant="100" id="kf7-tp-XAe"/>
+                            <constraint firstItem="M3E-Ei-iG0" firstAttribute="top" secondItem="wyO-bR-owd" secondAttribute="bottom" priority="750" constant="100" id="kf7-tp-XAe">
+                                <variation key="widthClass=regular" constant="50"/>
+                            </constraint>
                             <constraint firstItem="l6w-E8-vrr" firstAttribute="centerX" secondItem="anA-WQ-694" secondAttribute="centerX" id="krr-dd-vSg"/>
                             <constraint firstItem="l6w-E8-vrr" firstAttribute="top" secondItem="Bhr-Sz-DsQ" secondAttribute="bottom" id="m88-tH-cDI"/>
                             <constraint firstItem="l6w-E8-vrr" firstAttribute="leading" secondItem="anA-WQ-694" secondAttribute="leadingMargin" constant="-20" id="q0V-ks-SF7"/>
@@ -938,7 +942,7 @@
                         <subviews>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="gmD-FQ-6K1">
                                 <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
-                                <color key="backgroundColor" red="0.96078431369999995" green="0.96078431369999995" blue="0.96078431369999995" alpha="1" colorSpace="calibratedRGB"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" scrollDirection="horizontal" minimumLineSpacing="10" minimumInteritemSpacing="10" id="UGg-ww-zQ6">
                                     <size key="itemSize" width="102" height="42"/>
                                     <size key="headerReferenceSize" width="0.0" height="0.0"/>
@@ -975,7 +979,7 @@
                                 </cells>
                             </collectionView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="gmD-FQ-6K1" firstAttribute="top" secondItem="kCv-em-FrJ" secondAttribute="top" id="4zb-nY-Vnl"/>
                             <constraint firstItem="gmD-FQ-6K1" firstAttribute="leading" secondItem="kCv-em-FrJ" secondAttribute="leading" id="8kQ-H7-VUS"/>
diff --git a/Kiwix-iOS/View/ShadowView.swift b/Kiwix-iOS/View/ShadowView.swift
index 6f98de05..278821de 100644
--- a/Kiwix-iOS/View/ShadowView.swift
+++ b/Kiwix-iOS/View/ShadowView.swift
@@ -9,17 +9,50 @@
 import UIKit
 
 class DropShadowView: UIView {
+    var bottomBorder: CALayer?
     override func drawRect(rect: CGRect) {
+        switch traitCollection.horizontalSizeClass {
+        case .Regular:
+            layer.shadowRadius = 0.0
+            layer.shadowOpacity = 0.0
+            layer.backgroundColor = UIColor.whiteColor().CGColor
+            
+            let border: CALayer = {
+                if let border = bottomBorder {
+                    return border
+                } else {
+                    let border = CALayer()
+                    bottomBorder = border
+                    border.backgroundColor = UIColor.lightGrayColor().colorWithAlphaComponent(0.75).CGColor
+                    border.frame = CGRectMake(0, rect.height - 0.5, rect.width, 0.5)
+                    return border
+                }
+            }()
+            layer.addSublayer(border)
+        case .Compact:
+            layer.shadowRadius = 2.0
+            layer.shadowOpacity = 0.5
+            layer.backgroundColor = UIColor(red: 240/255, green: 240/255, blue: 240/255, alpha: 1.0).CGColor
+            if let border = bottomBorder {border.removeFromSuperlayer()}
+        default:
+            break
+        }
+    }
+    
+    override func awakeFromNib() {
         layer.masksToBounds = false
         layer.shadowOffset = CGSizeMake(0, 0)
-        layer.shadowRadius = 2.0
-        layer.shadowOpacity = 0.5
     }
     
     override func layoutSubviews() {
         super.layoutSubviews()
         layer.shadowPath = UIBezierPath(rect: bounds).CGPath
     }
+    
+    override func traitCollectionDidChange(previousTraitCollection: UITraitCollection?) {
+        guard previousTraitCollection != traitCollection else {return}
+        setNeedsDisplay()
+    }
 }
 
 class SearchHRegularDropShadowView: UIView {
@@ -28,7 +61,7 @@ class SearchHRegularDropShadowView: UIView {
         layer.cornerRadius = 10.0
         layer.shadowOffset = CGSizeMake(0, 0)
         layer.shadowRadius = 50.0
-        layer.shadowOpacity = 0.1
+        layer.shadowOpacity = 0.2
     }
     
     override func layoutSubviews() {