Update camera UX

AlexLittlejohn · Narek1994 · Aug 24, 2017 · Aug 24, 2017 · Aug 25, 2017 · Aug 28, 2017
commit 5d7879eaf36f8eee46df95c49348adf27f0bbc70
diff --git a/ALCameraViewController.xcodeproj/project.pbxproj b/ALCameraViewController.xcodeproj/project.pbxproj
@@ -68,6 +68,7 @@
 		E36A37BB1FABB5C100485FD4 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E36A37B81FABB5C000485FD4 /* Crashlytics.framework */; };
 		E36A37BC1FABB5C100485FD4 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E36A37B91FABB5C100485FD4 /* Fabric.framework */; };
 		E36A37BD1FABB5C100485FD4 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E36A37B91FABB5C100485FD4 /* Fabric.framework */; };
+		E36A37BF1FABBB7E00485FD4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E36A37BE1FABBB7E00485FD4 /* LaunchScreen.storyboard */; };
 		EBFE097D1CAF1D1A00A8C637 /* UIViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBFE097C1CAF1D1A00A8C637 /* UIViewExtensions.swift */; };
 		FA52EE0B1B44129B00E16B6F /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA52EE0A1B44129B00E16B6F /* ViewController.xib */; };
 		FA5FA3431B3AFA2B00497C62 /* PermissionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA5FA3421B3AFA2B00497C62 /* PermissionsView.swift */; };
@@ -122,6 +123,7 @@
 		E3669CCD1F96859A00CCDD01 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/ConfirmViewController.strings"; sourceTree = "<group>"; };
 		E36A37B81FABB5C000485FD4 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
 		E36A37B91FABB5C100485FD4 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = "<group>"; };
+		E36A37BE1FABBB7E00485FD4 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
 		EBFE097C1CAF1D1A00A8C637 /* UIViewExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIViewExtensions.swift; sourceTree = "<group>"; };
 		FA52EE0A1B44129B00E16B6F /* ViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ViewController.xib; sourceTree = "<group>"; };
 		FA5FA3421B3AFA2B00497C62 /* PermissionsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PermissionsView.swift; sourceTree = "<group>"; };
@@ -266,6 +268,7 @@
 		FAF058421B31618D008E5592 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				E36A37BE1FABBB7E00485FD4 /* LaunchScreen.storyboard */,
 				FAF0584B1B31618D008E5592 /* Images.xcassets */,
 				FAF058431B31618D008E5592 /* Info.plist */,
 			);
@@ -406,6 +409,7 @@
 				FA778A411B8319D8005807E7 /* image.jpg in Resources */,
 				BF5861F31F613FB800B406F6 /* CropViewController.xib in Resources */,
 				B2357AB11FA50D51003F9ACF /* FilterViewController.xib in Resources */,
+				E36A37BF1FABBB7E00485FD4 /* LaunchScreen.storyboard in Resources */,
 				BF5861F81F61404C00B406F6 /* ConfirmViewController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

diff --git a/ALCameraViewController/CameraViewAssets.xcassets/anchorButton.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/anchorButton.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "anchorButton.pdf"
+      "filename" : "anchorbutton.pdf"
     }
   ],
   "info" : {

diff --git a/...ts/anchorButton.imageset/anchorButton.pdf → ...ts/anchorButton.imageset/anchorbutton.pdf b/...ts/anchorButton.imageset/anchorButton.pdf → ...ts/anchorButton.imageset/anchorbutton.pdf
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/bwFilterHighlight.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "bwFilterHighlight.pdf"
+      "filename" : "filter_bw_highlight.pdf"
     }
   ],
   "info" : {

diff --git a/...rHighlight.imageset/bwFilterHighlight.pdf → ...ighlight.imageset/filter_bw_highlight.pdf b/...rHighlight.imageset/bwFilterHighlight.pdf → ...ighlight.imageset/filter_bw_highlight.pdf
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/bwFilterNormal.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "bwFilterNormal.pdf"
+      "filename" : "filter_bw.pdf"
     }
   ],
   "info" : {

diff --git a/...wFilterNormal.imageset/bwFilterNormal.pdf → ...ets/bwFilterNormal.imageset/filter_bw.pdf b/...wFilterNormal.imageset/bwFilterNormal.pdf → ...ets/bwFilterNormal.imageset/filter_bw.pdf
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterHighlight.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/colorFilterHighlight.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "colorFilterHighlight.pdf"
+      "filename" : "filter_color_highlight.pdf"
     }
   ],
   "info" : {

diff --git a/...ilterNormal.imageset/grayFilterNormal.pdf → ...light.imageset/filter_color_highlight.pdf b/...ilterNormal.imageset/grayFilterNormal.pdf → ...light.imageset/filter_color_highlight.pdf
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/colorFilterNormal.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "colorFilterNormal.pdf"
+      "filename" : "filter_color.pdf"
     }
   ],
   "info" : {

diff --git a/...lterNormal.imageset/colorFilterNormal.pdf → ...lorFilterNormal.imageset/filter_color.pdf b/...lterNormal.imageset/colorFilterNormal.pdf → ...lorFilterNormal.imageset/filter_color.pdf
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/crop_a4_paper_normal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/crop_a4_paper_normal.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "crop_a4_paper_normal.pdf"
+      "filename" : "crop_a4.pdf"
     }
   ],
   "info" : {

diff --git a/...re_normal.imageset/crop_square_normal.pdf → ...crop_a4_paper_normal.imageset/crop_a4.pdf b/...re_normal.imageset/crop_square_normal.pdf → ...crop_a4_paper_normal.imageset/crop_a4.pdf
diff --git a/...ViewController/CameraViewAssets.xcassets/crop_detect_border_normal.imageset/Contents.json b/...ViewController/CameraViewAssets.xcassets/crop_detect_border_normal.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "crop_detect_border_normal.pdf"
+      "filename" : "crop_border.pdf"
     }
   ],
   "info" : {

diff --git a/...ewController/CameraViewAssets.xcassets/crop_detect_border_normal.imageset/crop_border.pdf b/...ewController/CameraViewAssets.xcassets/crop_detect_border_normal.imageset/crop_border.pdf
diff --git a/...ameraViewAssets.xcassets/crop_detect_border_normal.imageset/crop_detect_border_normal.pdf b/...ameraViewAssets.xcassets/crop_detect_border_normal.imageset/crop_detect_border_normal.pdf
diff --git a/...eraViewController/CameraViewAssets.xcassets/crop_full_image_normal.imageset/Contents.json b/...eraViewController/CameraViewAssets.xcassets/crop_full_image_normal.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "crop_full_image_normal.pdf"
+      "filename" : "crop_full.pdf"
     }
   ],
   "info" : {

diff --git a/...ormal.imageset/crop_full_image_normal.pdf → ..._full_image_normal.imageset/crop_full.pdf b/...ormal.imageset/crop_full_image_normal.pdf → ..._full_image_normal.imageset/crop_full.pdf
diff --git a/...aViewController/CameraViewAssets.xcassets/crop_no_statusbar_normal.imageset/Contents.json b/...aViewController/CameraViewAssets.xcassets/crop_no_statusbar_normal.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "crop_no_statusbar_normal.pdf"
+      "filename" : "crop_screenshot.pdf"
     }
   ],
   "info" : {

diff --git a/...mal.imageset/crop_no_statusbar_normal.pdf → ...usbar_normal.imageset/crop_screenshot.pdf b/...mal.imageset/crop_no_statusbar_normal.pdf → ...usbar_normal.imageset/crop_screenshot.pdf
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/crop_square_normal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/crop_square_normal.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "crop_square_normal.pdf"
+      "filename" : "crop_square.pdf"
     }
   ],
   "info" : {

diff --git a/..._normal.imageset/crop_a4_paper_normal.pdf → ...op_square_normal.imageset/crop_square.pdf b/..._normal.imageset/crop_a4_paper_normal.pdf → ...op_square_normal.imageset/crop_square.pdf
diff --git a/...raViewController/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/Contents.json b/...raViewController/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "exposureFilterHighlight.pdf"
+      "filename" : "filter_exposure_hightlight.pdf"
     }
   ],
   "info" : {

diff --git a/...er/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/exposureFilterHighlight.pdf b/...er/CameraViewAssets.xcassets/exposureFilterHighlight.imageset/exposureFilterHighlight.pdf
diff --git a/...CameraViewAssets.xcassets/exposureFilterHighlight.imageset/filter_exposure_hightlight.pdf b/...CameraViewAssets.xcassets/exposureFilterHighlight.imageset/filter_exposure_hightlight.pdf
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "exposureFilterNormal.pdf"
+      "filename" : "filter_exposure.pdf"
     }
   ],
   "info" : {

diff --git a/...iewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/filter_exposure.pdf b/...iewController/CameraViewAssets.xcassets/exposureFilterNormal.imageset/filter_exposure.pdf
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterHighlight.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/grayFilterHighlight.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "grayFilterHighlight.pdf"
+      "filename" : "filter_gray_highlight.pdf"
     }
   ],
   "info" : {

diff --git a/...ntroller/CameraViewAssets.xcassets/grayFilterHighlight.imageset/filter_gray_highlight.pdf b/...ntroller/CameraViewAssets.xcassets/grayFilterHighlight.imageset/filter_gray_highlight.pdf
diff --git a/...Controller/CameraViewAssets.xcassets/grayFilterHighlight.imageset/grayFilterHighlight.pdf b/...Controller/CameraViewAssets.xcassets/grayFilterHighlight.imageset/grayFilterHighlight.pdf
diff --git a/ALCameraViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/Contents.json b/ALCameraViewController/CameraViewAssets.xcassets/grayFilterNormal.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "grayFilterNormal.pdf"
+      "filename" : "filter_gray.pdf"
     }
   ],
   "info" : {

diff --git a/...ghlight.imageset/colorFilterHighlight.pdf → ...grayFilterNormal.imageset/filter_gray.pdf b/...ghlight.imageset/colorFilterHighlight.pdf → ...grayFilterNormal.imageset/filter_gray.pdf
diff --git a/...iginalFilterNormal.imageset/Contents.json → ....xcassets/nav_back.imageset/Contents.json b/...iginalFilterNormal.imageset/Contents.json → ....xcassets/nav_back.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "originalFilterNormal.pdf"
+      "filename" : "nav_back.pdf"
     }
   ],
   "info" : {

diff --git a/...rNormal.imageset/exposureFilterNormal.pdf → ...s.xcassets/nav_back.imageset/nav_back.pdf b/...rNormal.imageset/exposureFilterNormal.pdf → ...s.xcassets/nav_back.imageset/nav_back.pdf
diff --git a/...raViewController/CameraViewAssets.xcassets/originalFilterHighlight.imageset/Contents.json b/...raViewController/CameraViewAssets.xcassets/originalFilterHighlight.imageset/Contents.json
diff --git a/...er/CameraViewAssets.xcassets/originalFilterHighlight.imageset/originalFilterHighlight.pdf b/...er/CameraViewAssets.xcassets/originalFilterHighlight.imageset/originalFilterHighlight.pdf
diff --git a/...ntroller/CameraViewAssets.xcassets/originalFilterNormal.imageset/originalFilterNormal.pdf b/...ntroller/CameraViewAssets.xcassets/originalFilterNormal.imageset/originalFilterNormal.pdf
diff --git a/ALCameraViewController/Utilities/UIButtonExtensions.swift b/ALCameraViewController/Utilities/UIButtonExtensions.swift
@@ -52,3 +52,46 @@ extension UIButton {
     }
 }
 
+extension UIBarButtonItem {
+
+  private struct AssociatedKeys {
+    static var ActionKey = "ActionKey"
+  }
+
+  private class ActionWrapper {
+    let action: ButtonAction
+    init(action: @escaping ButtonAction) {
+      self.action = action
+    }
+  }
+
+  var itemAction: ButtonAction? {
+    set(newValue) {
+      target = nil
+      action = nil
+      var wrapper: ActionWrapper? = nil
+      if let newValue = newValue {
+        wrapper = ActionWrapper(action: newValue)
+        target = self
+        action = #selector(performAction)
+      }
+
+      objc_setAssociatedObject(self, &AssociatedKeys.ActionKey, wrapper, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+    }
+    get {
+      guard let wrapper = objc_getAssociatedObject(self, &AssociatedKeys.ActionKey) as? ActionWrapper else {
+        return nil
+      }
+
+      return wrapper.action
+    }
+  }
+
+  func performAction() {
+    guard let action = itemAction else {
+      return
+    }
+
+    action()
+  }
+}
diff --git a/ALCameraViewController/ViewController/Base.lproj/CameraViewController.xib b/ALCameraViewController/ViewController/Base.lproj/CameraViewController.xib
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="ipad9_7" orientation="portrait">
+    <device id="ipad12_9" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -24,14 +23,18 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+            <rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qpY-V8-aOM" customClass="CameraView" customModule="ALCameraViewController" customModuleProvider="target">
+                    <rect key="frame" x="0.0" y="20" width="1024" height="1346"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GeG-7E-YhE" userLabel="TopBar">
-                    <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                    <rect key="frame" x="0.0" y="20" width="1024" height="44"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T05-DW-nx9">
-                            <rect key="frame" x="716" y="0.0" width="44" height="44"/>
+                            <rect key="frame" x="972" y="0.0" width="44" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="44" id="9kD-ej-J3I"/>
                                 <constraint firstAttribute="height" constant="44" id="FUu-CZ-h2j"/>
@@ -47,7 +50,7 @@
                             <state key="normal" image="swapButton"/>
                         </button>
                     </subviews>
-                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="calibratedRGB"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="bottom" secondItem="T05-DW-nx9" secondAttribute="bottom" id="1m5-Fn-HaE"/>
                         <constraint firstAttribute="trailing" secondItem="T05-DW-nx9" secondAttribute="trailing" constant="8" id="70I-pN-QZM"/>
@@ -58,18 +61,11 @@
                         <constraint firstItem="qIC-aq-pXR" firstAttribute="leading" secondItem="GeG-7E-YhE" secondAttribute="leading" constant="8" id="X49-oh-2UR"/>
                     </constraints>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qpY-V8-aOM" customClass="CameraView" customModule="ALCameraViewController" customModuleProvider="target">
-                    <rect key="frame" x="0.0" y="-233.99999999999997" width="768" height="1023.5"/>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                    <constraints>
-                        <constraint firstAttribute="width" secondItem="qpY-V8-aOM" secondAttribute="height" multiplier="3:4" id="tKI-DK-48f"/>
-                    </constraints>
-                </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SYY-32-acK" userLabel="Bottom">
-                    <rect key="frame" x="0.0" y="901" width="768" height="123"/>
+                    <rect key="frame" x="0.0" y="1243" width="1024" height="123"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="31q-oP-VTF">
-                            <rect key="frame" x="352.5" y="30" width="64" height="64"/>
+                            <rect key="frame" x="480.5" y="29.5" width="64" height="64"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="64" id="Lsl-BL-is6"/>
                                 <constraint firstAttribute="width" constant="64" id="kEL-vh-npa"/>
@@ -78,23 +74,23 @@
                             <state key="highlighted" image="cameraButtonHighlighted"/>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ERQ-At-bZe">
-                            <rect key="frame" x="711" y="45" width="33" height="33"/>
+                            <rect key="frame" x="967" y="45.5" width="33" height="33"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="33" id="YXI-KU-dBr"/>
                                 <constraint firstAttribute="width" constant="33" id="amV-zt-4xc"/>
                             </constraints>
                             <state key="normal" image="libraryButton"/>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0T3-fj-1PF">
-                            <rect key="frame" x="24" y="45" width="33" height="33"/>
+                            <rect key="frame" x="24" y="45.5" width="33" height="33"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="33" id="cOb-Ik-kqN"/>
                                 <constraint firstAttribute="width" constant="33" id="wP6-4A-ccb"/>
                             </constraints>
                             <state key="normal" image="closeButton"/>
                         </button>
                     </subviews>
-                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="calibratedRGB"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstItem="0T3-fj-1PF" firstAttribute="centerY" secondItem="SYY-32-acK" secondAttribute="centerY" id="0cD-AJ-jbT"/>
                         <constraint firstAttribute="trailing" secondItem="ERQ-At-bZe" secondAttribute="trailing" constant="24" id="5mk-CL-OZF"/>
@@ -108,19 +104,16 @@
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
             <constraints>
-                <constraint firstItem="GeG-7E-YhE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="7oe-7W-1fo"/>
-                <constraint firstItem="0O4-X5-Pk0" firstAttribute="bottom" secondItem="SYY-32-acK" secondAttribute="bottom" id="D8B-M3-Gu8"/>
-                <constraint firstItem="qpY-V8-aOM" firstAttribute="top" relation="lessThanOrEqual" secondItem="GeG-7E-YhE" secondAttribute="bottom" id="G3f-oY-Jwd"/>
+                <constraint firstItem="GeG-7E-YhE" firstAttribute="top" secondItem="0O4-X5-Pk0" secondAttribute="top" id="7oe-7W-1fo"/>
+                <constraint firstItem="qpY-V8-aOM" firstAttribute="top" secondItem="0O4-X5-Pk0" secondAttribute="top" id="G3f-oY-Jwd"/>
                 <constraint firstItem="SYY-32-acK" firstAttribute="leading" secondItem="0O4-X5-Pk0" secondAttribute="leading" id="Oh7-Wz-jxt"/>
+                <constraint firstItem="0O4-X5-Pk0" firstAttribute="bottom" secondItem="qpY-V8-aOM" secondAttribute="bottom" id="PK5-8Q-RCe"/>
                 <constraint firstItem="0O4-X5-Pk0" firstAttribute="trailing" secondItem="SYY-32-acK" secondAttribute="trailing" id="Q0T-Ji-Qbz"/>
                 <constraint firstItem="0O4-X5-Pk0" firstAttribute="trailing" secondItem="qpY-V8-aOM" secondAttribute="trailing" id="Rvo-jw-fVq"/>
                 <constraint firstItem="0O4-X5-Pk0" firstAttribute="trailing" secondItem="GeG-7E-YhE" secondAttribute="trailing" id="Zcs-Ab-QzI"/>
                 <constraint firstItem="GeG-7E-YhE" firstAttribute="leading" secondItem="0O4-X5-Pk0" secondAttribute="leading" id="cJf-HG-RlX"/>
-                <constraint firstItem="GeG-7E-YhE" firstAttribute="leading" secondItem="0O4-X5-Pk0" secondAttribute="leading" id="e9d-Sb-qpt"/>
-                <constraint firstItem="SYY-32-acK" firstAttribute="top" relation="lessThanOrEqual" secondItem="qpY-V8-aOM" secondAttribute="bottom" priority="750" id="k9X-U9-XJr"/>
+                <constraint firstItem="SYY-32-acK" firstAttribute="bottom" secondItem="0O4-X5-Pk0" secondAttribute="bottom" id="k9X-U9-XJr"/>
                 <constraint firstItem="qpY-V8-aOM" firstAttribute="leading" secondItem="0O4-X5-Pk0" secondAttribute="leading" id="tgg-Zd-Ran"/>
-                <constraint firstItem="0O4-X5-Pk0" firstAttribute="trailing" secondItem="GeG-7E-YhE" secondAttribute="trailing" id="uy9-jd-9Aw"/>
-                <constraint firstItem="0O4-X5-Pk0" firstAttribute="bottom" secondItem="qpY-V8-aOM" secondAttribute="bottom" priority="751" constant="234.33333333333326" id="wZs-v8-8OP"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <viewLayoutGuide key="safeArea" id="0O4-X5-Pk0"/>