Skip to content

Commit 951e842

Browse files
HirdayGuptaHirdayGupta
authored
Merge pending PRs into Development (#146)
* Add Activity Indicators There are now activity indicators for when the menu overview loads and what nutrition details load. * Activity Indicator for Show More The show more button on the menu VC now shows an activity indicator until the detailed menu is loaded. * Fix feedback & settings, add image picker to edit profile * Ability to use Moya endpoint to delete user on canceling signup, use segmented controls for year selection * Update AppDelegate.swift * one commit to rule them all srsly tho never again * Update presentModally to deprecated push to support nav controllers * Force light mode * Update MenuVC.swift Potentially fixed double de neve bug (still needs to be tested) * Revert unneccesary changes
1 parent e0b4d78 commit 951e842

32 files changed

+859
-259
lines changed

‎Bruin Bite.xcodeproj/project.pbxproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
77949970203BD10500F3B0ED /* AllergyFilterButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7794996F203BD10400F3B0ED /* AllergyFilterButton.swift */; };
5858
77949972203BD12B00F3B0ED /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77949971203BD12B00F3B0ED /* Extensions.swift */; };
5959
9C91B493798C96CEA3BC0AA4 /* Pods_Bruin_Bite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D31D0C9107AF44D73AA341C1 /* Pods_Bruin_Bite.framework */; };
60+
AB4DE42E235D27AE00E5FD5F /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB4DE42D235D27AE00E5FD5F /* TabBarController.swift */; };
6061
BD392821215C3638007FD4AD /* BBStoryboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD392820215C3638007FD4AD /* BBStoryboard.swift */; };
6162
BD78709921AD352100E46A50 /* UserDefaultsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD78709821AD352100E46A50 /* UserDefaultsManager.swift */; };
6263
BD7870A621B6793A00E46A50 /* PresentAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7870A521B6793A00E46A50 /* PresentAlert.swift */; };
@@ -181,6 +182,7 @@
181182
770CDEAF20266B6000658925 /* ActivityLevelBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActivityLevelBar.swift; sourceTree = "<group>"; };
182183
7794996F203BD10400F3B0ED /* AllergyFilterButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AllergyFilterButton.swift; sourceTree = "<group>"; };
183184
77949971203BD12B00F3B0ED /* Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
185+
AB4DE42D235D27AE00E5FD5F /* TabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TabBarController.swift; path = "Bruin Bite/View Controllers/TabBarController.swift"; sourceTree = SOURCE_ROOT; };
184186
BD392820215C3638007FD4AD /* BBStoryboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BBStoryboard.swift; sourceTree = "<group>"; };
185187
BD78709821AD352100E46A50 /* UserDefaultsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsManager.swift; sourceTree = "<group>"; };
186188
BD7870A521B6793A00E46A50 /* PresentAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentAlert.swift; sourceTree = "<group>"; };
@@ -307,6 +309,7 @@
307309
2A94477B2055F5570033B6C6 /* View Controllers */ = {
308310
isa = PBXGroup;
309311
children = (
312+
AB4DE42D235D27AE00E5FD5F /* TabBarController.swift */,
310313
2AFA40B320BC07BC0007FB85 /* MatchingViewControllers */,
311314
2A03D94020B76B88004EFC97 /* PopupViewControllers */,
312315
BF0523E2209AA7E00013EE11 /* ProfileViewController.swift */,
@@ -644,7 +647,7 @@
644647
files = (
645648
);
646649
inputPaths = (
647-
"${PODS_ROOT}/Target Support Files/Pods-Bruin Bite/Pods-Bruin Bite-frameworks.sh",
650+
"${SRCROOT}/Pods/Target Support Files/Pods-Bruin Bite/Pods-Bruin Bite-frameworks.sh",
648651
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
649652
"${BUILT_PRODUCTS_DIR}/CZPicker/CZPicker.framework",
650653
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
@@ -675,7 +678,7 @@
675678
);
676679
runOnlyForDeploymentPostprocessing = 0;
677680
shellPath = /bin/sh;
678-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Bruin Bite/Pods-Bruin Bite-frameworks.sh\"\n";
681+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Bruin Bite/Pods-Bruin Bite-frameworks.sh\"\n";
679682
showEnvVarsInLog = 0;
680683
};
681684
/* End PBXShellScriptBuildPhase section */
@@ -711,6 +714,7 @@
711714
2AFB41372047F0F2004025F9 /* MenuCardCollectionViewCell.swift in Sources */,
712715
2A16F9A720BEA204008BA4E3 /* ComingSoonPopup.swift in Sources */,
713716
00A89A9422851AE500DF78C8 /* ProfilePictureAPI.swift in Sources */,
717+
AB4DE42E235D27AE00E5FD5F /* TabBarController.swift in Sources */,
714718
770CDEAE20266B0800658925 /* ColoredCircle.swift in Sources */,
715719
2AB62E702048D21D0013CB59 /* ActivityLevel.swift in Sources */,
716720
2AFA40B120BC07AD0007FB85 /* MatchFoundViewController.swift in Sources */,

‎Bruin Bite/Network/MenuAPI.swift

+2
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ extension API{
155155
provider.request(.getDetailedMenu) { result in
156156
switch result{
157157
case let .success(response):
158+
DispatchQueue.global(qos: .background).async {
158159
do{
159160
let json = try JSON(data: response.data)
160161
let data = json["menus"]
@@ -280,6 +281,7 @@ extension API{
280281
catch{
281282
print("error parsing")
282283
}
284+
}
283285
case let .failure(error):
284286
print(error)
285287
}

‎Bruin Bite/Storyboards/Base.lproj/Main.storyboard

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Hbc-kS-Pis">
3-
<device id="retina5_5" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Hbc-kS-Pis">
3+
<device id="retina5_5" orientation="portrait" appearance="light"/>
64
<dependencies>
75
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
97
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
108
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
119
</dependencies>
@@ -23,7 +21,8 @@
2321
<!--Tab Bar Controller-->
2422
<scene sceneID="yl2-sM-qoP">
2523
<objects>
26-
<tabBarController storyboardIdentifier="MainView" useStoryboardIdentifierAsRestorationIdentifier="YES" id="49e-Tb-3d3" sceneMemberID="viewController">
24+
<tabBarController storyboardIdentifier="MainView" useStoryboardIdentifierAsRestorationIdentifier="YES" id="49e-Tb-3d3" customClass="TabBarController" customModule="Bruin_Bite" customModuleProvider="target" sceneMemberID="viewController">
25+
<navigationItem key="navigationItem" id="kbc-pq-EPC"/>
2726
<tabBar key="tabBar" contentMode="scaleToFill" translucent="NO" id="W28-zg-YXA">
2827
<rect key="frame" x="0.0" y="975" width="768" height="49"/>
2928
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
@@ -69,7 +68,7 @@
6968
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
7069
<subviews>
7170
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LoginLogo" translatesAutoresizingMaskIntoConstraints="NO" id="v20-Ap-vhn">
72-
<rect key="frame" x="153" y="101" width="108" height="144"/>
71+
<rect key="frame" x="153" y="81" width="108" height="144"/>
7372
<constraints>
7473
<constraint firstAttribute="width" secondItem="v20-Ap-vhn" secondAttribute="height" multiplier="3:4" id="3MG-kH-ins"/>
7574
<constraint firstAttribute="height" constant="144" id="Aty-gf-zJq"/>
@@ -91,8 +90,8 @@
9190
</view>
9291
<connections>
9392
<outlet property="activityIndicator" destination="nKv-fG-GXK" id="YSA-cQ-DWM"/>
94-
<segue destination="49e-Tb-3d3" kind="show" identifier="loggedIn" id="L40-xt-xeQ"/>
95-
<segue destination="kGz-ox-4hs" kind="showDetail" identifier="notLogged" id="T46-Hk-js6"/>
93+
<segue destination="49e-Tb-3d3" kind="presentation" identifier="loggedIn" modalPresentationStyle="fullScreen" modalTransitionStyle="crossDissolve" id="L40-xt-xeQ"/>
94+
<segue destination="kGz-ox-4hs" kind="presentation" identifier="notLogged" modalPresentationStyle="fullScreen" modalTransitionStyle="crossDissolve" id="T46-Hk-js6"/>
9695
</connections>
9796
</viewController>
9897
<placeholder placeholderIdentifier="IBFirstResponder" id="dsq-tq-W2N" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -102,7 +101,9 @@
102101
<!--Login-->
103102
<scene sceneID="slE-v6-atg">
104103
<objects>
105-
<viewControllerPlaceholder storyboardName="Login" id="kGz-ox-4hs" sceneMemberID="viewController"/>
104+
<viewControllerPlaceholder storyboardName="Login" id="kGz-ox-4hs" sceneMemberID="viewController">
105+
<navigationItem key="navigationItem" id="UiU-kX-L2T"/>
106+
</viewControllerPlaceholder>
106107
<placeholder placeholderIdentifier="IBFirstResponder" id="92C-SD-mOk" userLabel="First Responder" sceneMemberID="firstResponder"/>
107108
</objects>
108109
<point key="canvasLocation" x="-262" y="-152"/>

0 commit comments

Comments
 (0)