Skip to content

Fix UI overlap and padding issues #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aly-cloud merged 5 commits into from
Apr 19, 2026
Merged

Fix UI overlap and padding issues #224

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6787c7
ui progress
aly-cloud Mar 18, 2026
1fd24db
Deleted comments
aly-cloud Apr 4, 2026
79848cc
Updated Change Date Button Constraints
aly-cloud Apr 4, 2026
8abaf07
Deleted Comment
aly-cloud Apr 4, 2026
35e071f
Create Constant for Bottom Padding
aly-cloud Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions Eatery Blue/UI/EateryScreen/MenuHeaderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
}

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Eatery Blue/UI/HomeScreen/HomeViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ 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) + 25 // 108
collectionView.showsVerticalScrollIndicator = false

collectionView.register(
Expand Down
Loading