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.

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

Добавил UI экрана профиля #27

Merged
merged 1 commit into from
Apr 26, 2021
+774 −2
Merged

Добавил UI экрана профиля #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 20 additions & 0 deletions YetAnotherDelivery/YetAnotherDelivery.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
77F388F4261A1D9B00975226 /* MenuProtocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F388F3261A1D9B00975226 /* MenuProtocols.swift */; };
77F38903261A232300975226 /* DishCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F38902261A232300975226 /* DishCell.swift */; };
77F38906261A586600975226 /* YADLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F38905261A586600975226 /* YADLabel.swift */; };
C57F067F2635DF54002346A5 /* ProfileScreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C57F067E2635DF54002346A5 /* ProfileScreenViewController.swift */; };
C57F06832635DF99002346A5 /* ProfileScreenPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C57F06822635DF99002346A5 /* ProfileScreenPresenter.swift */; };
C57F06872635DFA5002346A5 /* ProfileScreenModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C57F06862635DFA5002346A5 /* ProfileScreenModel.swift */; };
C59718E42617A11C00BEF029 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C59718E32617A11C00BEF029 /* AppDelegate.swift */; };
C59718E62617A11C00BEF029 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C59718E52617A11C00BEF029 /* SceneDelegate.swift */; };
C59718E82617A11C00BEF029 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C59718E72617A11C00BEF029 /* ViewController.swift */; };
Expand Down Expand Up @@ -79,6 +82,9 @@
77F38902261A232300975226 /* DishCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DishCell.swift; sourceTree = "<group>"; };
77F38905261A586600975226 /* YADLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YADLabel.swift; sourceTree = "<group>"; };
B4BDF7EB6287D5FBCEBF1144 /* Pods_YetAnotherDelivery.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YetAnotherDelivery.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C57F067E2635DF54002346A5 /* ProfileScreenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileScreenViewController.swift; sourceTree = "<group>"; };
C57F06822635DF99002346A5 /* ProfileScreenPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileScreenPresenter.swift; sourceTree = "<group>"; };
C57F06862635DFA5002346A5 /* ProfileScreenModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileScreenModel.swift; sourceTree = "<group>"; };
C59718E02617A11C00BEF029 /* YetAnotherDelivery.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YetAnotherDelivery.app; sourceTree = BUILT_PRODUCTS_DIR; };
C59718E32617A11C00BEF029 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
C59718E52617A11C00BEF029 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -274,6 +280,16 @@
path = Presenter;
sourceTree = "<group>";
};
C57F06812635DF68002346A5 /* ProfileScreen */ = {
isa = PBXGroup;
children = (
C57F067E2635DF54002346A5 /* ProfileScreenViewController.swift */,
C57F06862635DFA5002346A5 /* ProfileScreenModel.swift */,
C57F06822635DF99002346A5 /* ProfileScreenPresenter.swift */,
);
path = ProfileScreen;
sourceTree = "<group>";
};
C59718D72617A11C00BEF029 = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -307,6 +323,7 @@
77F388F6261A1DA000975226 /* MenuModule */,
77E5E99426317CB900CB4914 /* DishModule */,
77E5E9AF2632DA4000CB4914 /* OrderModule */,
C57F06812635DF68002346A5 /* ProfileScreen */,
C59718EC2617A11E00BEF029 /* Assets.xcassets */,
C59718EE2617A11E00BEF029 /* LaunchScreen.storyboard */,
C59718F12617A11E00BEF029 /* Info.plist */,
Expand Down Expand Up @@ -427,6 +444,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C57F06872635DFA5002346A5 /* ProfileScreenModel.swift in Sources */,
77F38903261A232300975226 /* DishCell.swift in Sources */,
77014CAC263371AF0029855F /* Location.swift in Sources */,
77E5E98E26317CA500CB4914 /* DishPresenter.swift in Sources */,
Expand All @@ -441,6 +459,7 @@
77E89B6B2619F2EA0039C987 /* YADView.swift in Sources */,
77E89B332619CCD70039C987 /* HomeView.swift in Sources */,
77F388F4261A1D9B00975226 /* MenuProtocols.swift in Sources */,
C57F06832635DF99002346A5 /* ProfileScreenPresenter.swift in Sources */,
77CB03752630BC1D00A5F529 /* Dish.swift in Sources */,
77E5E99C263204D100CB4914 /* OrderCell.swift in Sources */,
77E5E9A42632D7D600CB4914 /* AssemblyOrderModules.swift in Sources */,
Expand All @@ -449,6 +468,7 @@
77E5E9BE2633087700CB4914 /* DishOrderCell.swift in Sources */,
77CB036F2630B73300A5F529 /* MenuDish.swift in Sources */,
77F388F1261A1D8D00975226 /* MenuView.swift in Sources */,
C57F067F2635DF54002346A5 /* ProfileScreenViewController.swift in Sources */,
C59718E42617A11C00BEF029 /* AppDelegate.swift in Sources */,
77E5E9AA2632DA2E00CB4914 /* OrderPresenter.swift in Sources */,
77E5E98A26317C9700CB4914 /* DishView.swift in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions YetAnotherDelivery/YetAnotherDelivery/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
orderRouter.initOrderModule()

// MARK:- Profile Module
let profile = ViewController()
profile.view.backgroundColor = .green
let profile = ProfileScreenViewController()
// profile.view.backgroundColor = .green
if let testDataImg = UIImage(named: "profile")?.pngData() {
let testImg = UIImage(data: testDataImg, scale: 15.25)
let testBarItem = UITabBarItem(title: "Профиль", image: testImg, selectedImage: nil)
Expand Down
8 changes: 8 additions & 0 deletions YetAnotherDelivery/YetAnotherDelivery/ProfileScreen/ProfileScreenModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//
// ProfileScreenModel.swift
// YetAnotherDelivery
//
// Created by Shamil Imanov on 25.04.2021.
//

import Foundation
8 changes: 8 additions & 0 deletions YetAnotherDelivery/YetAnotherDelivery/ProfileScreen/ProfileScreenPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//
// ProfileScreenPresenter.swift
// YetAnotherDelivery
//
// Created by Shamil Imanov on 25.04.2021.
//

import Foundation
Loading