Skip to content
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.

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

Develop #142

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions UberEats/Common/Common/HTTPURLResponse+StatusCode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@ public extension HTTPURLResponse {

var httpStatusCode: HTTPStatusCode {
get {

guard let code = HTTPStatusCode(rawValue: statusCode) else {
return HTTPStatusCode.nil
}

return code
}
}

}
4 changes: 4 additions & 0 deletions UberEats/Common/Common/ImageNetworkManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@ public class ImageNetworkManager {
}

private func downloadImage(imageURL: URL, complection: @escaping (UIImage?, Error?) -> Void) {

session.dataTask(with: imageURL) { [weak self] (data, _, error) in

if error != nil {
return
}

guard let data = data else {
return
}
Expand All @@ -41,6 +44,7 @@ public class ImageNetworkManager {
DispatchQueue.main.async {
complection(image, nil)
}

}.resume()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ class DependencyPool {

return dependency as! T
}

}

enum DependencyPoolError: Error {
Expand Down
9 changes: 2 additions & 7 deletions UberEats/UberEats.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,6 @@
isa = PBXGroup;
children = (
99342CCC21FB13110029DB10 /* Utill */,
99342CC321FB12CF0029DB10 /* UberEatsTests.swift */,
99342CC521FB12CF0029DB10 /* Info.plist */,
);
path = UberEatsTests;
sourceTree = "<group>";
Expand All @@ -443,7 +441,6 @@
99342CCC21FB13110029DB10 /* Utill */ = {
isa = PBXGroup;
children = (
99342CCF21FB13790029DB10 /* ThrottlerTests.swift */,
);
path = Utill;
sourceTree = "<group>";
Expand All @@ -463,7 +460,6 @@
isa = PBXGroup;
children = (
9956F7ED21F98468004E9854 /* UberEats.app */,
99342CC121FB12CF0029DB10 /* UberEatsTests.xctest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -897,7 +893,6 @@
);
name = UberEatsTests;
productName = UberEatsTests;
productReference = 99342CC121FB12CF0029DB10 /* UberEatsTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
9956F7EC21F98468004E9854 /* UberEats */ = {
Expand Down Expand Up @@ -1122,8 +1117,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
99342CD021FB13790029DB10 /* ThrottlerTests.swift in Sources */,
99342CC421FB12CF0029DB10 /* UberEatsTests.swift in Sources */,
99342CD021FB13790029DB10 /* (null) in Sources */,
99342CC421FB12CF0029DB10 /* (null) in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "99342CC021FB12CF0029DB10"
BuildableName = "UberEatsTests.xctest"
BuildableName = "UberEatsTests"
BlueprintName = "UberEatsTests"
ReferencedContainer = "container:UberEats.xcodeproj">
</BuildableReference>
Expand Down
48 changes: 48 additions & 0 deletions UberEats/UberEats/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
//
// AppDelegate.swift
// UberEats
//
// Created by 장공의 on 24/01/2019.
// Copyright © 2019 team-b1. All rights reserved.
//

import UIKit

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.

//window = UIWindow(frame: UIScreen.main.bounds)

//window?.rootViewController = TabBarVC()

//window?.makeKeyAndVisible()

return true
}

func applicationWillResignActive(_ application: UIApplication) {

}

func applicationDidEnterBackground(_ application: UIApplication) {
}

func applicationWillEnterForeground(_ application: UIApplication) {

}

func applicationDidBecomeActive(_ application: UIApplication) {

}

func applicationWillTerminate(_ application: UIApplication) {

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class OrderCheckingCollectionReusableView: UICollectionReusableView {

var progressStatus: ProgressStatus? {
didSet {

guard let status = progressStatus else {
return
}
Expand Down
Loading