Fix UI overlap and padding issues (#224)

* ui progress

fixed take 1

* Deleted comments

Deleted comments to clean up code!

* Updated Change Date Button Constraints

Shrunk fixed button width and shrunk Calendar icon frame to show the full "Closed Today," and shrunk the right button inset to make Change Date button insets more even

* Deleted Comment

* Create Constant for Bottom Padding

Total is 108

Author: aly-cloud

Eatery Blue/UI/EateryScreen/MenuHeaderView.swift

@@ -64,7 +64,17 @@ class MenuHeaderView: UIView {
     private func setUpButtonImageView() {
         buttonView.backgroundColor = UIColor.Eatery.gray00
         buttonView.layer.cornerRadius = 21
-        buttonView.layoutMargins = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 16)
+        buttonView.layoutMargins = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 14)
+        let imageView = UIImageView()
+        imageView.image = UIImage(named: "EateryCalendar")
+        imageView.contentMode = .center
+
+        buttonView.addSubview(imageView)
+        imageView.snp.makeConstraints { make in
+            make.width.height.equalTo(36)
+            make.leading.equalTo(buttonView.layoutMarginsGuide)
+            make.centerY.equalTo(buttonView)
+        }
 
         let titleLabel = UILabel()
         titleLabel.text = "Change Date"
@@ -73,18 +83,8 @@ class MenuHeaderView: UIView {
 
         buttonView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
-            make.trailing.equalTo(buttonView.layoutMarginsGuide)
-            make.centerY.equalTo(buttonView)
-        }
-
-        let imageView = UIImageView()
-        imageView.image = UIImage(named: "EateryCalendar")
-        imageView.contentMode = .center
-
-        buttonView.addSubview(imageView)
-        imageView.snp.makeConstraints { make in
-            make.width.height.equalTo(40)
-            make.leading.equalTo(buttonView.layoutMarginsGuide)
+            make.leading.equalTo(imageView.snp.trailing)
+            make.trailing.lessThanOrEqualTo(buttonView.layoutMarginsGuide)
             make.centerY.equalTo(buttonView)
         }
 
@@ -102,6 +102,7 @@ class MenuHeaderView: UIView {
     private func setUpConstraints() {
         titleLabel.snp.makeConstraints { make in
             make.top.leading.equalTo(layoutMarginsGuide)
+            make.trailing.lessThanOrEqualTo(buttonView.snp.leading)
         }
 
         subtitleLabel.snp.makeConstraints { make in

Eatery Blue/UI/HomeScreen/HomeViewController.swift

@@ -46,6 +46,7 @@ class HomeViewController: UIViewController {
         static let loadingHeaderHeight: CGFloat = maxHeaderHeight + 52
         static let collectionViewTopPadding: CGFloat = 8
         static let collectionViewSectionPadding: CGFloat = 16
+        static let collectionViewBottomPadding: CGFloat = 25
         static let isTesting = false
     }
 
@@ -121,7 +122,8 @@ class HomeViewController: UIViewController {
         collectionView.backgroundColor = UIColor.Eatery.surface
         collectionView.contentInsetAdjustmentBehavior = .never
         collectionView.delegate = self
-        collectionView.contentInset.bottom = tabBarController?.tabBar.frame.height ?? 0
+        collectionView.contentInset.bottom = (tabBarController?.tabBar.frame.height ?? 0) + Constants
+            .collectionViewBottomPadding
         collectionView.showsVerticalScrollIndicator = false
 
         collectionView.register(