Skip to content

Extended Menu Redesign Pt.1 #318

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

Open
NgaiJustin wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Extended Menu Redesign Pt.1 #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
932e2b2
Implement spacing between categories views and insert header above ea…
NgaiJustin Nov 14, 2021
15ec60d
Fix issue with extra divider on top of each category
NgaiJustin Nov 14, 2021
dc2adc6
Remove filter button and filter label
NgaiJustin Nov 17, 2021
9e2d420
Remove extra comment
NgaiJustin Nov 21, 2021
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
6 changes: 3 additions & 3 deletions Eatery.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,7 +1908,7 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = N85YZLFRGD;
DEVELOPMENT_TEAM = ZGMCXU7X3U;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
Expand Down Expand Up @@ -2086,7 +2086,7 @@
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = N85YZLFRGD;
DEVELOPMENT_TEAM = ZGMCXU7X3U;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
Expand Down Expand Up @@ -2171,7 +2171,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = N85YZLFRGD;
DEVELOPMENT_TEAM = ZGMCXU7X3U;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
Expand Down
40 changes: 0 additions & 40 deletions Eatery/Controllers/Eateries/Campus/ScrollableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ class ScrollableViewController: UIViewController {
private func createTabBarStack() {
headerContainer = ExpandedHeaderContainer()
headerContainer.backgroundColor = .white
headerContainer.addFilterButtonTarget(self, action: #selector(filterButtonPressed), forEvent: .touchUpInside)

headerContainer.snp.makeConstraints { make in
make.height.equalTo(58)
}
Expand Down Expand Up @@ -204,17 +202,6 @@ class ScrollableViewController: UIViewController {
tabBar.select(at: selectionIndex)
}

@objc func filterButtonPressed() {
headerContainer.filterButtonPressed()

if headerContainer.getFilterButtonState() != .inactive {
hideTabBar()
} else {
showTabBar()
headerContainer.setFilterLabelText(to: "")
}
}

private func hideTabBar() {
UIView.animate(withDuration: 0.45) {
let adjustedPosTabBar = (self.headerContainer.frame.height / 2) - (self.tabBar.frame.height / 2)
Expand All @@ -224,13 +211,6 @@ class ScrollableViewController: UIViewController {
self.tabBar.center.y = self.headerContainer.center.y + adjustedPosTabBar
self.menuItemsView.center.y = self.tabBar.center.y + adjustedPosMenuStack
}

if headerContainer.getFilterButtonState() == .hightolow {
scrollView?.contentSize.height -= tabBar.frame.height // Does not animate when subtracted
switchToHighToLowStack()
} else if headerContainer.getFilterButtonState() == .lowtohigh {
switchToLowToHighStack()
}
}

private func showTabBar() {
Expand All @@ -243,26 +223,6 @@ class ScrollableViewController: UIViewController {
self.menuItemsView.center.y = self.tabBar.center.y + adjustedPosMenuStack
self.scrollView?.contentSize.height += self.tabBar.frame.height
}

switchToOriginalStack()
}

private func switchToHighToLowStack() {
menuItemsView.createHighToLowStackIfNeeded()
headerContainer.setFilterLabelText(to: "Highest \u{2794} Lowest")
menuItemsView.switchVisibleStack(type: .highToLow)
}

private func switchToLowToHighStack() {
menuItemsView.createLowToHighStackIfNeeded()
headerContainer.setFilterLabelText(to: "Lowest \u{2794} Highest")
menuItemsView.switchVisibleStack(type: .lowToHigh)

}

private func switchToOriginalStack() {
headerContainer.setFilterLabelText(to: "")
menuItemsView.switchVisibleStack(type: .original)
}

override func viewWillAppear(_ animated: Bool) {
Expand Down
40 changes: 0 additions & 40 deletions Eatery/Views/Eateries/EateryScreenViews/ExpandedMenus/ExpandedHeaderContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import UIKit

class ExpandedHeaderContainer: UIView {

private var filterButton: ExpandedFilterButton!
private var filterLabel: UILabel!
private var separatorView: SeparatorView!

Expand All @@ -26,17 +25,6 @@ class ExpandedHeaderContainer: UIView {
titleLabel.preservesSuperviewLayoutMargins = true
addSubview(titleLabel)

filterButton = ExpandedFilterButton(frame: .zero, inactiveColor: .systemGray, activeColor: .eateryBlue)
filterButton.preservesSuperviewLayoutMargins = true
addSubview(filterButton)

filterLabel = UILabel()
filterLabel.textColor = .eateryBlue
filterLabel.font = .boldSystemFont(ofSize: 11)
filterLabel.text = ""
filterLabel.preservesSuperviewLayoutMargins = true
addSubview(filterLabel)

separatorView = SeparatorView(insets: UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0))
separatorView.tintColor = .clear
separatorView.isHidden = true
Expand All @@ -48,18 +36,6 @@ class ExpandedHeaderContainer: UIView {
make.bottom.equalToSuperview()
}

filterButton.snp.makeConstraints { make in
make.centerY.equalTo(titleLabel.snp.centerY)
make.height.equalTo(titleLabel.snp.height).multipliedBy(0.3)
make.trailing.equalToSuperview().offset(-tabBarPadding)
make.width.equalTo(filterButton.snp.height).multipliedBy(1.7)
}

filterLabel.snp.makeConstraints { make in
make.centerY.equalTo(titleLabel.snp.centerY)
make.trailing.equalTo(filterButton.snp.leading).offset(-6)
}

separatorView.snp.makeConstraints { make in
make.leading.trailing.bottom.equalToSuperview()
}
Expand All @@ -69,22 +45,6 @@ class ExpandedHeaderContainer: UIView {
fatalError("init(coder:) has not been implemented")
}

func addFilterButtonTarget(_ target: Any?, action: Selector, forEvent: UIControlEvents) {
filterButton.addTarget(target, action: action, for: forEvent)
}

func filterButtonPressed() {
filterButton.pressed()
}

func getFilterButtonState() -> ExpandedFilterButtonState {
filterButton.filterState
}

func setFilterLabelText(to text: String) {
filterLabel.text = text
}

func setSeparatorViewHidden(to hidden: Bool) {
separatorView.isHidden = hidden
}
Expand Down
20 changes: 18 additions & 2 deletions Eatery/Views/Eateries/EateryScreenViews/ExpandedMenus/ExpandedMenuCategoryView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// CampusEateryExtendedMenuViewController.swift
// ExpandedMenuCategoryView.swift
// Eatery
//
// Created by Sergio Diaz on 12/20/20.
Expand All @@ -13,6 +13,7 @@ class ExpandedMenuCategoryView: UIView {
let eatery: CampusEatery!
let category: String!
let menu: [ExpandedMenu.Item]!
let categoryLabel: UILabel!

/// Public variable that allows other VCs to easily get height of this view
var contentHeight: CGFloat = 0
Expand All @@ -36,11 +37,26 @@ class ExpandedMenuCategoryView: UIView {
stackView.spacing = 0
stackView.axis = .vertical

categoryLabel = UILabel()
categoryLabel.text = category
categoryLabel.font = .systemFont(ofSize: 18, weight: .semibold)

super.init(frame: .zero)
Copy link
Member

@dishanest dishanest Nov 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make first line of function

backgroundColor = .white

addSubview(categoryLabel)
categoryLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(12)
make.leading.equalToSuperview().offset(16)
make.trailing.equalToSuperview()
}

addSubview(stackView)
stackView.snp.makeConstraints { make in
make.edges.equalToSuperview()
make.top.equalTo(categoryLabel.snp.bottom).offset(4)
make.leading.equalToSuperview()
make.trailing.equalToSuperview()
make.bottom.equalToSuperview()
Comment on lines +57 to +59
Copy link
Contributor

@Npikielny Npikielny Nov 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be shortened: make.leading.trailing.bottom.equalToSuperview()

}

}
Expand Down
2 changes: 2 additions & 0 deletions Eatery/Views/Eateries/EateryScreenViews/ExpandedMenus/ExpandedMenuItemsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class ExpandedMenuItemView: UIView {
self.allMenuItems = allMenuItems

menuItemsStack = UIStackView(arrangedSubviews: views)
menuItemsStack.spacing = 8
menuItemsStack.backgroundColor = .wash
menuItemsStack.axis = .vertical
addSubview(menuItemsStack)

Expand Down
2 changes: 1 addition & 1 deletion Eatery/Views/Eateries/EateryScreenViews/ExpandedMenus/ExpandedMenuRow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ExpandedMenuRow: UIView {

separator.snp.makeConstraints { make in
make.height.equalTo(1)
make.top.equalToSuperview()
make.bottom.equalToSuperview()
make.leading.equalToSuperview().offset(padding - lineOffset)
make.trailing.equalToSuperview().offset(-padding + lineOffset)
}
Expand Down