Skip to content

wired up new ui flow #25

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

Closed
junebash wants to merge 3 commits into from
Closed

wired up new ui flow #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df8ceba
wire up loginVC
Nov 20, 2019
169db77
wire up detailVC
Nov 20, 2019
7cc6360
wire up orderVC
Nov 20, 2019
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
20 changes: 16 additions & 4 deletions Snackify/Storyboards/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,10 @@
</view>
<navigationItem key="navigationItem" id="XaY-CP-EmV"/>
<connections>
<outlet property="OrderDeadlineLabel" destination="J2D-og-8Yy" id="Jku-Mx-Obc"/>
<outlet property="amountOfSnacksLabel" destination="r5h-iA-IZQ" id="fpT-De-1Ma"/>
<outlet property="priceTotalLabel" destination="hCX-Ws-UcD" id="oY5-PL-WVe"/>
<outlet property="snacksListLabel" destination="tCB-jP-frT" id="qoc-Vv-RBx"/>
<outlet property="subscriptionEndLabel" destination="J2D-og-8Yy" id="Jku-Mx-Obc"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="FyN-8J-csp" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
Expand Down Expand Up @@ -296,7 +297,7 @@
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<segue destination="dZZ-Jn-TD8" kind="presentation" id="oMD-Uy-hMJ"/>
<action selector="buyNowTapped:" destination="0TB-hm-mlU" eventType="touchUpInside" id="0xb-9r-hRX"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gyh-c4-gUh">
Expand All @@ -306,6 +307,9 @@
<state key="normal" title="Request Subscription">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<action selector="subscriptionAddTapped:" destination="0TB-hm-mlU" eventType="touchUpInside" id="AAq-At-Os5"/>
</connections>
</button>
</subviews>
</stackView>
Expand Down Expand Up @@ -527,7 +531,13 @@
</constraints>
<viewLayoutGuide key="safeArea" id="g8A-jv-64b"/>
</view>
<navigationItem key="navigationItem" id="mY9-14-7mR"/>
<navigationItem key="navigationItem" id="mY9-14-7mR">
<barButtonItem key="rightBarButtonItem" title="Place Order" image="cart" catalog="system" id="X4z-zS-wOk">
<connections>
<segue destination="dZZ-Jn-TD8" kind="presentation" identifier="PlaceOrderFromDetailVCSegue" id="Q3S-FL-222"/>
</connections>
</barButtonItem>
</navigationItem>
<connections>
<outlet property="allergensLabel" destination="UeC-J8-G63" id="fTx-Am-7Ys"/>
<outlet property="caloriesLabel" destination="riS-6R-XNq" id="l8Q-rM-Trm"/>
Expand All @@ -536,6 +546,7 @@
<outlet property="proteinLabel" destination="kVO-al-VFP" id="4hj-sB-o0B"/>
<outlet property="servingsLabel" destination="kJE-9Y-mkP" id="mrU-k7-6rS"/>
<outlet property="snackNameLabel" destination="o6I-4Z-BjW" id="Oq3-TF-2Y1"/>
<outlet property="subscriptionAddButton" destination="gyh-c4-gUh" id="orE-Jq-p0P"/>
<outlet property="totalFatLabel" destination="JNL-gi-sJi" id="YHa-Qp-Wr8"/>
<outlet property="totalSugarLabel" destination="kJJ-Lx-Ua4" id="muD-4K-R4r"/>
<outlet property="totalWeightLabel" destination="cit-Jd-B5q" id="U3S-9J-F32"/>
Expand Down Expand Up @@ -700,6 +711,7 @@
<outlet property="organizationTextField" destination="9Mx-KO-zwx" id="Pq1-OK-iMl"/>
<outlet property="passwordTextField" destination="JdM-jb-UQq" id="8nf-aH-kpd"/>
<outlet property="phoneNumberTextField" destination="jCU-VD-2Rz" id="5NR-lV-XZ4"/>
<outlet property="roleSegmentedControl" destination="gzL-IV-lBK" id="qdf-6q-lbx"/>
<outlet property="stateTextField" destination="r4U-QB-sTQ" id="CSk-Lb-aZz"/>
<outlet property="usernameTextField" destination="7wt-SZ-o4L" id="S0f-4i-jBr"/>
<outlet property="zipcodeTextField" destination="tsu-6e-rvK" id="v35-ch-RVA"/>
Expand Down Expand Up @@ -732,6 +744,6 @@
<image name="cart" catalog="system" width="64" height="50"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="oMD-Uy-hMJ"/>
<segue reference="Q3S-FL-222"/>
</inferredMetricsTieBreakers>
</document>
1 change: 1 addition & 0 deletions Snackify/View Controllers/LoginViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class LoginViewController: UIViewController {
var authType = AuthType.logIn

//MARK: Outlets
@IBOutlet weak var roleSegmentedControl: UISegmentedControl!
@IBOutlet weak var loginSegmentedControl: UISegmentedControl!

@IBOutlet weak var usernameTextField: UITextField!
Expand Down
13 changes: 12 additions & 1 deletion Snackify/View Controllers/SnackDetailViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ class SnackDetailViewController: UIViewController {

var snack: Snack?

//MARK: Outlets
//MARK: - Outlets

@IBOutlet weak var snackNameLabel: UILabel!
@IBOutlet weak var typeLabel: UILabel!
@IBOutlet weak var servingsLabel: UILabel!
Expand All @@ -26,12 +27,22 @@ class SnackDetailViewController: UIViewController {
@IBOutlet weak var carbsLabel: UILabel!
@IBOutlet weak var allergensLabel: UILabel!

@IBOutlet weak var subscriptionAddButton: UIButton!

override func viewDidLoad() {
super.viewDidLoad()

updateViews()
}

// MARK: - Actions

@IBAction func buyNowTapped(_ sender: UIButton) {
}

@IBAction func subscriptionAddTapped(_ sender: UIButton) {
}

func updateViews() {
guard let snack = snack,
let nutriInfo = snack.nutritionInfo
Expand Down
4 changes: 3 additions & 1 deletion Snackify/View Controllers/SnacksOrderViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ import UIKit
class SnacksOrderViewController: UIViewController {

//MARK: Outlets

@IBOutlet weak var amountOfSnacksLabel: UILabel!
@IBOutlet weak var snacksListLabel: UILabel!
@IBOutlet weak var priceTotalLabel: UILabel!
@IBOutlet weak var OrderDeadlineLabel: UILabel!
@IBOutlet weak var subscriptionEndLabel: UILabel!

override func viewDidLoad() {
super.viewDidLoad()
Expand Down