From fe2015d01c76f2eff0283e934d5452fe05188934 Mon Sep 17 00:00:00 2001 From: Amy Yang Date: Wed, 11 Mar 2026 16:45:12 -0400 Subject: [PATCH 1/4] compare menus button padding --- Eatery Blue/UI/HomeScreen/HomeViewController.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Eatery Blue/UI/HomeScreen/HomeViewController.swift b/Eatery Blue/UI/HomeScreen/HomeViewController.swift index f6e9fa8..eae4aa7 100644 --- a/Eatery Blue/UI/HomeScreen/HomeViewController.swift +++ b/Eatery Blue/UI/HomeScreen/HomeViewController.swift @@ -121,7 +121,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 + compareMenusButton.frame + .height collectionView.showsVerticalScrollIndicator = false collectionView.register( From 0fe7594b06f0e3ebbd2d53e523ffe94c68f4ddad Mon Sep 17 00:00:00 2001 From: Amy Yang Date: Wed, 11 Mar 2026 17:23:29 -0400 Subject: [PATCH 2/4] temp changes --- Eatery Blue/UI/HomeScreen/HomeViewController.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Eatery Blue/UI/HomeScreen/HomeViewController.swift b/Eatery Blue/UI/HomeScreen/HomeViewController.swift index eae4aa7..68dc634 100644 --- a/Eatery Blue/UI/HomeScreen/HomeViewController.swift +++ b/Eatery Blue/UI/HomeScreen/HomeViewController.swift @@ -118,11 +118,12 @@ class HomeViewController: UIViewController { } private func setUpCollectionView() { - collectionView.backgroundColor = UIColor.Eatery.surface + collectionView.backgroundColor = UIColor.Eatery.green // .surface collectionView.contentInsetAdjustmentBehavior = .never collectionView.delegate = self collectionView.contentInset.bottom = tabBarController?.tabBar.frame.height ?? 0 + compareMenusButton.frame - .height + .height + 60 + print(compareMenusButton.frame.height) collectionView.showsVerticalScrollIndicator = false collectionView.register( From 1772b095b28ce5b5b15f7840bcd264441daf2329 Mon Sep 17 00:00:00 2001 From: Amy Yang Date: Wed, 11 Mar 2026 18:23:28 -0400 Subject: [PATCH 3/4] updated about me --- .../SettingsAboutModelController.swift | 155 ++++++++++-------- 1 file changed, 84 insertions(+), 71 deletions(-) diff --git a/Eatery Blue/UI/SettingsAbout/SettingsAboutModelController.swift b/Eatery Blue/UI/SettingsAbout/SettingsAboutModelController.swift index cb5b295..027675f 100644 --- a/Eatery Blue/UI/SettingsAbout/SettingsAboutModelController.swift +++ b/Eatery Blue/UI/SettingsAbout/SettingsAboutModelController.swift @@ -15,92 +15,105 @@ class SettingsAboutModelController: SettingsAboutViewController { private let sections = [ Section(title: "Pod Leads", members: [ - "TK Kong", - "William Ma", - "Conner Swenberg", - "Connor Reinhold", - "Gracie Jing", - "Sergio Diaz", - "Matthew Wong", - "Antoinette Torres", - "Thomas Vignos" + "Aayush Agnihotri", + "Stefanie Rivera-Osorio", + "Anvi Savant", + "Angela Chiang", + "Leah Kim", + "Angelina Chen", + "Adelynn Wu", + "Amy Wang", + "Ashley Herrera", + "Nina Zambrano" ]), Section(title: "Product Designers", members: [ - "TK Kong", - "Brendan Elliot", - "Zain Khoja", - "Michael Huang", - "Ravina Patel", - "Gracie Jing", - "Zixian Jia", - "Dennis Quizhpi", - "Kathleen Anderson", + "Yoobin Lee", + "Gillian Fang", + "Selena Chen", + "Angela Chiang", + "Leah Kim", + "Lorna Ding", + "Seojin Park", + "Ethan G.R. Lee", + "Wonjin Eum", "Funmi Olukanmi", - "Carrie Kim" + "Lauren Jun" ]), Section(title: "iOS Developers", members: [ - "William Ma", - "Ethan Fine", - "Gonzalo Gonzalez", - "Reade Plunkett", - "Sergio Diaz", - "Daniel Vebman", - "Justin Ngai", - "Jennifer Gu", - "Antoinette Torres", - "Jayson Hahn", + "Charles Liggins", + "Jay Zheng", + "Zain Bilal", + "Angelina Chen", + "Adelynn Wu", + "Duru Alayli", + "Jiwon Jeong", + "Asen Kim Ou", + "Andrew Gao", "Peter Bidoshi", - "Cassidy Xu", - "Charles Liggins" + "Alyssa Wang", + "Arielle Nudelman", + "Caitlyn Jin", + "Isha Nagireddy", + "Amy Yang", + "Kaylee Ulep", + "Gabriel Castillo", + "Anatoli Monsalve", + "Antoinette Torres" ]), Section(title: "Android Developers", members: [ - "Lesley Huang", - "Jae Young Choi", - "Jonvi Rollins", - "Connor Reinhold", - "Yanlam Ko", - "Chris Desir", - "Adam Kadhim", - "Aastha Shab", - "Jonah Gershon", - "Justin Guo", - "Kevin Sun", - "Emily Hu", - "Sophie Meng", + "Andrew Cheung", + "Connie Liu", + "Melissa Velasquez", + "Amy Wang", + "Caleb Shim", + "Emil Jiang", + "Ryan Cheung", + "Danny McCance", "Gregor Guerrier", - "Olivia Jiang", + "Brian Hu", + "Mabel Qiu", + "Jarmin Weng", + "Abigail Labanok", + "Preston Williams", + "Zachary Seidner", "Helen Bian", - "Amy Wang", - "Zach Seidner" + "Jonathan Chen" ]), Section(title: "Backend Developers", members: [ - "Conner Swenberg", - "Orko Sinha", - "Yuna Shin", - "Alanna Zhou", - "Raahi Menon", - "Shungo Najima", - "Mateo Weiner", - "Kidus Zegeye", - "Archit Mehta", - "Marcus Kim", - "Thomas Vignos", - "Aayush Agnihotri", - "Daniel Weiner", + "Joshua Dirga", + "Fanhao Yu", + "Chimdi Ejiogu", + "Ashley Herrera", + "Wyatt Cox", "Skye Slattery", - "Cassidy Xu" + "Lauren Ah-Hot", + "Cindy Liang", + "Sophie Strausberg", + "Chris Voon", + "Claire Yu", + "Anik Dey", + "Tran Tran", + "Olivia Yu", + "Kevin Biliguun", + "Anton Matchev" ]), Section(title: "Marketers", members: [ - "Cat Zhang", - "Faith Earley", - "Lucy Zhang", - "Neha Malepati", - "Vivian Park", - "Carnell Zhou", - "Jane Lee", - "Matthew Wong", - "Candy Wu", - "Anvi Savant" + "Christine Tao", + "Nina Zambrano", + "Rohan Sabbella", + "William Lee", + "Maya Levine", + "Parker Woo", + "Michael Hsieh", + "Enzo Hiu", + "Anna Felten", + "Wendy Yu", + "Carolyn Fu", + "Amber Dong", + "Monica Lee", + "Julia Kwon", + "Michael Abaseber", + "Candy Wu" ]) ] From 179a62b50c66b4219c91656c0e2cafee9e839982 Mon Sep 17 00:00:00 2001 From: Amy Yang Date: Wed, 11 Mar 2026 20:29:21 -0400 Subject: [PATCH 4/4] reverted changes and fixed name updates --- .../UI/HomeScreen/HomeViewController.swift | 6 +- .../SettingsAboutModelController.swift | 161 +++++++++--------- 2 files changed, 82 insertions(+), 85 deletions(-) diff --git a/Eatery Blue/UI/HomeScreen/HomeViewController.swift b/Eatery Blue/UI/HomeScreen/HomeViewController.swift index 68dc634..f6e9fa8 100644 --- a/Eatery Blue/UI/HomeScreen/HomeViewController.swift +++ b/Eatery Blue/UI/HomeScreen/HomeViewController.swift @@ -118,12 +118,10 @@ class HomeViewController: UIViewController { } private func setUpCollectionView() { - collectionView.backgroundColor = UIColor.Eatery.green // .surface + collectionView.backgroundColor = UIColor.Eatery.surface collectionView.contentInsetAdjustmentBehavior = .never collectionView.delegate = self - collectionView.contentInset.bottom = tabBarController?.tabBar.frame.height ?? 0 + compareMenusButton.frame - .height + 60 - print(compareMenusButton.frame.height) + collectionView.contentInset.bottom = tabBarController?.tabBar.frame.height ?? 0 collectionView.showsVerticalScrollIndicator = false collectionView.register( diff --git a/Eatery Blue/UI/SettingsAbout/SettingsAboutModelController.swift b/Eatery Blue/UI/SettingsAbout/SettingsAboutModelController.swift index 027675f..3856ac9 100644 --- a/Eatery Blue/UI/SettingsAbout/SettingsAboutModelController.swift +++ b/Eatery Blue/UI/SettingsAbout/SettingsAboutModelController.swift @@ -15,105 +15,104 @@ class SettingsAboutModelController: SettingsAboutViewController { private let sections = [ Section(title: "Pod Leads", members: [ - "Aayush Agnihotri", - "Stefanie Rivera-Osorio", - "Anvi Savant", - "Angela Chiang", - "Leah Kim", + "TK Kong", + "William Ma", + "Conner Swenberg", + "Connor Reinhold", + "Gracie Jing", + "Sergio Diaz", + "Matthew Wong", + "Antoinette Torres", + "Thomas Vignos", "Angelina Chen", - "Adelynn Wu", - "Amy Wang", - "Ashley Herrera", - "Nina Zambrano" + "Adelynn Wu" ]), Section(title: "Product Designers", members: [ - "Yoobin Lee", - "Gillian Fang", - "Selena Chen", - "Angela Chiang", - "Leah Kim", - "Lorna Ding", - "Seojin Park", - "Ethan G.R. Lee", - "Wonjin Eum", + "TK Kong", + "Brendan Elliot", + "Zain Khoja", + "Michael Huang", + "Ravina Patel", + "Gracie Jing", + "Zixian Jia", + "Dennis Quizhpi", + "Kathleen Anderson", "Funmi Olukanmi", - "Lauren Jun" + "Carrie Kim", + "Katie Li" ]), Section(title: "iOS Developers", members: [ + "William Ma", + "Ethan Fine", + "Gonzalo Gonzalez", + "Reade Plunkett", + "Sergio Diaz", + "Daniel Vebman", + "Justin Ngai", + "Jennifer Gu", + "Antoinette Torres", + "Jayson Hahn", + "Peter Bidoshi", + "Cassidy Xu", "Charles Liggins", - "Jay Zheng", - "Zain Bilal", - "Angelina Chen", "Adelynn Wu", - "Duru Alayli", - "Jiwon Jeong", - "Asen Kim Ou", - "Andrew Gao", - "Peter Bidoshi", - "Alyssa Wang", - "Arielle Nudelman", - "Caitlyn Jin", - "Isha Nagireddy", - "Amy Yang", - "Kaylee Ulep", - "Gabriel Castillo", - "Anatoli Monsalve", - "Antoinette Torres" + "Angelina Chen", + "Amy Yang" ]), Section(title: "Android Developers", members: [ - "Andrew Cheung", - "Connie Liu", - "Melissa Velasquez", - "Amy Wang", - "Caleb Shim", - "Emil Jiang", - "Ryan Cheung", - "Danny McCance", + "Lesley Huang", + "Jae Young Choi", + "Jonvi Rollins", + "Connor Reinhold", + "Yanlam Ko", + "Chris Desir", + "Adam Kadhim", + "Aastha Shab", + "Jonah Gershon", + "Justin Guo", + "Kevin Sun", + "Emily Hu", + "Sophie Meng", "Gregor Guerrier", - "Brian Hu", - "Mabel Qiu", - "Jarmin Weng", - "Abigail Labanok", - "Preston Williams", - "Zachary Seidner", + "Olivia Jiang", "Helen Bian", - "Jonathan Chen" + "Amy Wang", + "Zach Seidner", + "Brian Hu", + "Caleb Shim" ]), Section(title: "Backend Developers", members: [ - "Joshua Dirga", - "Fanhao Yu", - "Chimdi Ejiogu", - "Ashley Herrera", - "Wyatt Cox", + "Conner Swenberg", + "Orko Sinha", + "Yuna Shin", + "Alanna Zhou", + "Raahi Menon", + "Shungo Najima", + "Mateo Weiner", + "Kidus Zegeye", + "Archit Mehta", + "Marcus Kim", + "Thomas Vignos", + "Aayush Agnihotri", + "Daniel Weiner", "Skye Slattery", - "Lauren Ah-Hot", - "Cindy Liang", - "Sophie Strausberg", - "Chris Voon", - "Claire Yu", - "Anik Dey", - "Tran Tran", - "Olivia Yu", - "Kevin Biliguun", - "Anton Matchev" + "Cassidy Xu", + "Fanhao Yu", + "Chris Voon" ]), Section(title: "Marketers", members: [ - "Christine Tao", - "Nina Zambrano", - "Rohan Sabbella", - "William Lee", - "Maya Levine", - "Parker Woo", - "Michael Hsieh", - "Enzo Hiu", + "Cat Zhang", + "Faith Earley", + "Lucy Zhang", + "Neha Malepati", + "Vivian Park", + "Carnell Zhou", + "Jane Lee", + "Matthew Wong", + "Candy Wu", + "Anvi Savant", "Anna Felten", - "Wendy Yu", - "Carolyn Fu", - "Amber Dong", - "Monica Lee", - "Julia Kwon", - "Michael Abaseber", - "Candy Wu" + "Carolyn Fu" ]) ]