diff --git a/lesson-01/loginForm.xcodeproj/project.pbxproj b/lesson-01/loginForm.xcodeproj/project.pbxproj deleted file mode 100644 index da61d7b..0000000 --- a/lesson-01/loginForm.xcodeproj/project.pbxproj +++ /dev/null @@ -1,343 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 50; - objects = { - -/* Begin PBXBuildFile section */ - 9C761E7423E1EBE00090FB56 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C761E7323E1EBE00090FB56 /* AppDelegate.swift */; }; - 9C761E7623E1EBE00090FB56 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C761E7523E1EBE00090FB56 /* SceneDelegate.swift */; }; - 9C761E7823E1EBE00090FB56 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C761E7723E1EBE00090FB56 /* ViewController.swift */; }; - 9C761E7B23E1EBE00090FB56 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9C761E7923E1EBE00090FB56 /* Main.storyboard */; }; - 9C761E7D23E1EBE10090FB56 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9C761E7C23E1EBE10090FB56 /* Assets.xcassets */; }; - 9C761E8023E1EBE10090FB56 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9C761E7E23E1EBE10090FB56 /* LaunchScreen.storyboard */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 9C761E7023E1EBE00090FB56 /* loginForm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = loginForm.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 9C761E7323E1EBE00090FB56 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 9C761E7523E1EBE00090FB56 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - 9C761E7723E1EBE00090FB56 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 9C761E7A23E1EBE00090FB56 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 9C761E7C23E1EBE10090FB56 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 9C761E7F23E1EBE10090FB56 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 9C761E8123E1EBE10090FB56 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 9C761E6D23E1EBE00090FB56 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 9C761E6723E1EBE00090FB56 = { - isa = PBXGroup; - children = ( - 9C761E7223E1EBE00090FB56 /* loginForm */, - 9C761E7123E1EBE00090FB56 /* Products */, - ); - sourceTree = ""; - }; - 9C761E7123E1EBE00090FB56 /* Products */ = { - isa = PBXGroup; - children = ( - 9C761E7023E1EBE00090FB56 /* loginForm.app */, - ); - name = Products; - sourceTree = ""; - }; - 9C761E7223E1EBE00090FB56 /* loginForm */ = { - isa = PBXGroup; - children = ( - 9C761E7323E1EBE00090FB56 /* AppDelegate.swift */, - 9C761E7523E1EBE00090FB56 /* SceneDelegate.swift */, - 9C761E7723E1EBE00090FB56 /* ViewController.swift */, - 9C761E7923E1EBE00090FB56 /* Main.storyboard */, - 9C761E7C23E1EBE10090FB56 /* Assets.xcassets */, - 9C761E7E23E1EBE10090FB56 /* LaunchScreen.storyboard */, - 9C761E8123E1EBE10090FB56 /* Info.plist */, - ); - path = loginForm; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 9C761E6F23E1EBE00090FB56 /* loginForm */ = { - isa = PBXNativeTarget; - buildConfigurationList = 9C761E8423E1EBE10090FB56 /* Build configuration list for PBXNativeTarget "loginForm" */; - buildPhases = ( - 9C761E6C23E1EBE00090FB56 /* Sources */, - 9C761E6D23E1EBE00090FB56 /* Frameworks */, - 9C761E6E23E1EBE00090FB56 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = loginForm; - productName = loginForm; - productReference = 9C761E7023E1EBE00090FB56 /* loginForm.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 9C761E6823E1EBE00090FB56 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 1130; - LastUpgradeCheck = 1130; - ORGANIZATIONNAME = prot; - TargetAttributes = { - 9C761E6F23E1EBE00090FB56 = { - CreatedOnToolsVersion = 11.3.1; - }; - }; - }; - buildConfigurationList = 9C761E6B23E1EBE00090FB56 /* Build configuration list for PBXProject "loginForm" */; - compatibilityVersion = "Xcode 9.3"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 9C761E6723E1EBE00090FB56; - productRefGroup = 9C761E7123E1EBE00090FB56 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 9C761E6F23E1EBE00090FB56 /* loginForm */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 9C761E6E23E1EBE00090FB56 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9C761E8023E1EBE10090FB56 /* LaunchScreen.storyboard in Resources */, - 9C761E7D23E1EBE10090FB56 /* Assets.xcassets in Resources */, - 9C761E7B23E1EBE00090FB56 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 9C761E6C23E1EBE00090FB56 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9C761E7823E1EBE00090FB56 /* ViewController.swift in Sources */, - 9C761E7423E1EBE00090FB56 /* AppDelegate.swift in Sources */, - 9C761E7623E1EBE00090FB56 /* SceneDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 9C761E7923E1EBE00090FB56 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 9C761E7A23E1EBE00090FB56 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; - }; - 9C761E7E23E1EBE10090FB56 /* LaunchScreen.storyboard */ = { - isa = PBXVariantGroup; - children = ( - 9C761E7F23E1EBE10090FB56 /* Base */, - ); - name = LaunchScreen.storyboard; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 9C761E8223E1EBE10090FB56 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 9C761E8323E1EBE10090FB56 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.2; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 9C761E8523E1EBE10090FB56 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = X2648CBJ7V; - INFOPLIST_FILE = loginForm/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = prot.loginForm; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 9C761E8623E1EBE10090FB56 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = X2648CBJ7V; - INFOPLIST_FILE = loginForm/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = prot.loginForm; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 9C761E6B23E1EBE00090FB56 /* Build configuration list for PBXProject "loginForm" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9C761E8223E1EBE10090FB56 /* Debug */, - 9C761E8323E1EBE10090FB56 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 9C761E8423E1EBE10090FB56 /* Build configuration list for PBXNativeTarget "loginForm" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 9C761E8523E1EBE10090FB56 /* Debug */, - 9C761E8623E1EBE10090FB56 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 9C761E6823E1EBE00090FB56 /* Project object */; -} diff --git a/lesson-01/loginForm/Base.lproj/Main.storyboard b/lesson-01/loginForm/Base.lproj/Main.storyboard deleted file mode 100644 index 0c6dc4d..0000000 --- a/lesson-01/loginForm/Base.lproj/Main.storyboard +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lesson-01/loginForm/ViewController.swift b/lesson-01/loginForm/ViewController.swift deleted file mode 100644 index 2a52403..0000000 --- a/lesson-01/loginForm/ViewController.swift +++ /dev/null @@ -1,84 +0,0 @@ -// -// ViewController.swift -// loginForm -// -// Created by prot on 30/01/2020. -// Copyright © 2020 prot. All rights reserved. -// - -import UIKit - -class ViewController: UIViewController { - - @IBOutlet weak var scrollView: UIScrollView! - @IBOutlet weak var textFieldLogin: UITextField! - @IBOutlet weak var textFieldPass: UITextField! - @IBOutlet weak var labelLogin: UILabel! - - - - - override func viewDidLoad() { - super.viewDidLoad() - // Do any additional setup after loading the view. - let tapGesture = UITapGestureRecognizer(target: self, action: #selector(hideKeyboard)) //переменная для закрытия клавитуры при тапе - scrollView.addGestureRecognizer(tapGesture) // закрытие клавитуры - } - - @IBAction func buttonInTap(_ sender: Any) { - let login = textFieldLogin.text - let pass = textFieldPass.text - - if login == "admin" && pass == "admin" { - labelLogin.text = "Успешная авторизация" - }else { - labelLogin.text = "Неверный логин или пароль" - } - } - - - - override func viewWillAppear(_ animated: Bool) { - super.viewWillAppear(animated) - - // Подписываемся на два уведомления: одно приходит при появлении клавиатуры - - NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShown(notification:)), name: UIResponder.keyboardWillShowNotification, object: nil) - // Второе — когда она пропадает - NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(notification:)), name: UIResponder.keyboardWillHideNotification, object: nil) - } - // Когда клавиатура появляется - @objc func keyboardWillShown ( notification : Notification) { - // Получаем размер клавиатуры - let info = notification.userInfo! as NSDictionary - let size = (info.value(forKey: UIResponder.keyboardFrameEndUserInfoKey) as! NSValue).cgRectValue.size - let contentInsents = UIEdgeInsets(top: 0, left: 0, bottom: size.height, right: 0) - // Добавляем отступ внизу UIScrollView, равный размеру клавиатуры - self.scrollView?.contentInset = contentInsents - self.scrollView.scrollIndicatorInsets = contentInsents - - } - //Когда клавиатура исчезает - @objc func keyboardWillHide ( notification : Notification) { - // Устанавливаем отступ внизу UIScrollView, равный 0 - scrollView.contentInset = .zero - - } - //клик по пустому месту на экране сворачивает клаву - @objc func hideKeyboard() { - self.scrollView.endEditing(true) - } - - - - - - - - - - - - } - - diff --git a/lesson-02/.keep b/lesson-02/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/lesson-02/loginForm.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/lesson-02/loginForm.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 0684c7c..0000000 --- a/lesson-02/loginForm.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/lesson-02/loginForm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/lesson-02/loginForm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/lesson-02/loginForm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/lesson-02/loginForm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/lesson-02/loginForm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c..0000000 --- a/lesson-02/loginForm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/lesson-02/loginForm/AppDelegate.swift b/lesson-02/loginForm/AppDelegate.swift deleted file mode 100644 index 3528e17..0000000 --- a/lesson-02/loginForm/AppDelegate.swift +++ /dev/null @@ -1,37 +0,0 @@ -// -// AppDelegate.swift -// loginForm -// -// Created by prot on 30/01/2020. -// Copyright © 2020 prot. All rights reserved. -// - -import UIKit - -@UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { - - - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Override point for customization after application launch. - return true - } - - // MARK: UISceneSession Lifecycle - - func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { - // Called when a new scene session is being created. - // Use this method to select a configuration to create the new scene with. - return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) - } - - func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { - // Called when the user discards a scene session. - // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. - // Use this method to release any resources that were specific to the discarded scenes, as they will not return. - } - - -} - diff --git a/lesson-02/loginForm/Assets.xcassets/AppIcon.appiconset/Contents.json b/lesson-02/loginForm/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index d8db8d6..0000000 --- a/lesson-02/loginForm/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "3x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "3x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "83.5x83.5", - "scale" : "2x" - }, - { - "idiom" : "ios-marketing", - "size" : "1024x1024", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/lesson-02/loginForm/Assets.xcassets/Contents.json b/lesson-02/loginForm/Assets.xcassets/Contents.json deleted file mode 100644 index da4a164..0000000 --- a/lesson-02/loginForm/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/lesson-02/loginForm/Base.lproj/LaunchScreen.storyboard b/lesson-02/loginForm/Base.lproj/LaunchScreen.storyboard deleted file mode 100644 index 865e932..0000000 --- a/lesson-02/loginForm/Base.lproj/LaunchScreen.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lesson-02/loginForm/Info.plist b/lesson-02/loginForm/Info.plist deleted file mode 100644 index 2a3483c..0000000 --- a/lesson-02/loginForm/Info.plist +++ /dev/null @@ -1,64 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UIApplicationSceneManifest - - UIApplicationSupportsMultipleScenes - - UISceneConfigurations - - UIWindowSceneSessionRoleApplication - - - UISceneConfigurationName - Default Configuration - UISceneDelegateClassName - $(PRODUCT_MODULE_NAME).SceneDelegate - UISceneStoryboardFile - Main - - - - - UILaunchStoryboardName - LaunchScreen - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/lesson-02/loginForm/SceneDelegate.swift b/lesson-02/loginForm/SceneDelegate.swift deleted file mode 100644 index 306c3b9..0000000 --- a/lesson-02/loginForm/SceneDelegate.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// SceneDelegate.swift -// loginForm -// -// Created by prot on 30/01/2020. -// Copyright © 2020 prot. All rights reserved. -// - -import UIKit - -class SceneDelegate: UIResponder, UIWindowSceneDelegate { - - var window: UIWindow? - - - func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). - guard let _ = (scene as? UIWindowScene) else { return } - } - - func sceneDidDisconnect(_ scene: UIScene) { - // Called as the scene is being released by the system. - // This occurs shortly after the scene enters the background, or when its session is discarded. - // Release any resources associated with this scene that can be re-created the next time the scene connects. - // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead). - } - - func sceneDidBecomeActive(_ scene: UIScene) { - // Called when the scene has moved from an inactive state to an active state. - // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. - } - - func sceneWillResignActive(_ scene: UIScene) { - // Called when the scene will move from an active state to an inactive state. - // This may occur due to temporary interruptions (ex. an incoming phone call). - } - - func sceneWillEnterForeground(_ scene: UIScene) { - // Called as the scene transitions from the background to the foreground. - // Use this method to undo the changes made on entering the background. - } - - func sceneDidEnterBackground(_ scene: UIScene) { - // Called as the scene transitions from the foreground to the background. - // Use this method to save data, release shared resources, and store enough scene-specific state information - // to restore the scene back to its current state. - } - - -} - diff --git a/lesson-01/.keep b/lesson-03/.keep similarity index 100% rename from lesson-01/.keep rename to lesson-03/.keep diff --git a/lesson-02/loginForm.xcodeproj/project.pbxproj b/lesson-03/loginForm.xcodeproj/project.pbxproj similarity index 69% rename from lesson-02/loginForm.xcodeproj/project.pbxproj rename to lesson-03/loginForm.xcodeproj/project.pbxproj index d0fdc5c..29b8ac5 100644 --- a/lesson-02/loginForm.xcodeproj/project.pbxproj +++ b/lesson-03/loginForm.xcodeproj/project.pbxproj @@ -7,25 +7,41 @@ objects = { /* Begin PBXBuildFile section */ + 9C43514C23F2A79000FBFC58 /* Groups.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C43514B23F2A79000FBFC58 /* Groups.swift */; }; + 9C4AC87323F161CB00BFF5E7 /* LoginFormController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4AC87223F161CB00BFF5E7 /* LoginFormController.swift */; }; + 9C4AC87723F165E300BFF5E7 /* FriendsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4AC87623F165E300BFF5E7 /* FriendsTableViewController.swift */; }; + 9C4AC87923F167FF00BFF5E7 /* SubscriptionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4AC87823F167FF00BFF5E7 /* SubscriptionTableViewController.swift */; }; + 9C4AC87D23F168BC00BFF5E7 /* AllGroupsTableController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4AC87C23F168BC00BFF5E7 /* AllGroupsTableController.swift */; }; + 9C4AC88823F1855000BFF5E7 /* FriendsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4AC88723F1855000BFF5E7 /* FriendsCell.swift */; }; + 9C4AC88A23F1858000BFF5E7 /* GroupsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4AC88923F1858000BFF5E7 /* GroupsCell.swift */; }; + 9C4AC88C23F1864B00BFF5E7 /* FriendsCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4AC88B23F1864B00BFF5E7 /* FriendsCollectionCell.swift */; }; + 9C4AC88F23F1A0ED00BFF5E7 /* friendsStruct.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4AC88E23F1A0ED00BFF5E7 /* friendsStruct.swift */; }; + 9C4AC89123F1B19B00BFF5E7 /* FriendCollectionController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4AC89023F1B19B00BFF5E7 /* FriendCollectionController.swift */; }; 9C761E7423E1EBE00090FB56 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C761E7323E1EBE00090FB56 /* AppDelegate.swift */; }; 9C761E7623E1EBE00090FB56 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C761E7523E1EBE00090FB56 /* SceneDelegate.swift */; }; - 9C761E7823E1EBE00090FB56 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C761E7723E1EBE00090FB56 /* ViewController.swift */; }; 9C761E7B23E1EBE00090FB56 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9C761E7923E1EBE00090FB56 /* Main.storyboard */; }; 9C761E7D23E1EBE10090FB56 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9C761E7C23E1EBE10090FB56 /* Assets.xcassets */; }; 9C761E8023E1EBE10090FB56 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9C761E7E23E1EBE10090FB56 /* LaunchScreen.storyboard */; }; - 9CB6A6AF23E42F6D00891466 /* MyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CB6A6AE23E42F6D00891466 /* MyViewController.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 9C43514B23F2A79000FBFC58 /* Groups.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Groups.swift; sourceTree = ""; }; + 9C4AC87223F161CB00BFF5E7 /* LoginFormController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginFormController.swift; sourceTree = ""; }; + 9C4AC87623F165E300BFF5E7 /* FriendsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendsTableViewController.swift; sourceTree = ""; }; + 9C4AC87823F167FF00BFF5E7 /* SubscriptionTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionTableViewController.swift; sourceTree = ""; }; + 9C4AC87C23F168BC00BFF5E7 /* AllGroupsTableController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllGroupsTableController.swift; sourceTree = ""; }; + 9C4AC88723F1855000BFF5E7 /* FriendsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendsCell.swift; sourceTree = ""; }; + 9C4AC88923F1858000BFF5E7 /* GroupsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupsCell.swift; sourceTree = ""; }; + 9C4AC88B23F1864B00BFF5E7 /* FriendsCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendsCollectionCell.swift; sourceTree = ""; }; + 9C4AC88E23F1A0ED00BFF5E7 /* friendsStruct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = friendsStruct.swift; sourceTree = ""; }; + 9C4AC89023F1B19B00BFF5E7 /* FriendCollectionController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendCollectionController.swift; sourceTree = ""; }; 9C761E7023E1EBE00090FB56 /* loginForm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = loginForm.app; sourceTree = BUILT_PRODUCTS_DIR; }; 9C761E7323E1EBE00090FB56 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 9C761E7523E1EBE00090FB56 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - 9C761E7723E1EBE00090FB56 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; 9C761E7A23E1EBE00090FB56 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 9C761E7C23E1EBE10090FB56 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 9C761E7F23E1EBE10090FB56 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 9C761E8123E1EBE10090FB56 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9CB6A6AE23E42F6D00891466 /* MyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyViewController.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -39,6 +55,37 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 9C43514D23F2C12100FBFC58 /* Model */ = { + isa = PBXGroup; + children = ( + 9C4AC88E23F1A0ED00BFF5E7 /* friendsStruct.swift */, + 9C43514B23F2A79000FBFC58 /* Groups.swift */, + ); + path = Model; + sourceTree = ""; + }; + 9C4AC87E23F1698B00BFF5E7 /* Controllers */ = { + isa = PBXGroup; + children = ( + 9C4AC87623F165E300BFF5E7 /* FriendsTableViewController.swift */, + 9C4AC89023F1B19B00BFF5E7 /* FriendCollectionController.swift */, + 9C4AC87823F167FF00BFF5E7 /* SubscriptionTableViewController.swift */, + 9C4AC87C23F168BC00BFF5E7 /* AllGroupsTableController.swift */, + 9C4AC87223F161CB00BFF5E7 /* LoginFormController.swift */, + ); + path = Controllers; + sourceTree = ""; + }; + 9C4AC88D23F1865800BFF5E7 /* Cell */ = { + isa = PBXGroup; + children = ( + 9C4AC88723F1855000BFF5E7 /* FriendsCell.swift */, + 9C4AC88923F1858000BFF5E7 /* GroupsCell.swift */, + 9C4AC88B23F1864B00BFF5E7 /* FriendsCollectionCell.swift */, + ); + path = Cell; + sourceTree = ""; + }; 9C761E6723E1EBE00090FB56 = { isa = PBXGroup; children = ( @@ -60,9 +107,10 @@ children = ( 9C761E7323E1EBE00090FB56 /* AppDelegate.swift */, 9C761E7523E1EBE00090FB56 /* SceneDelegate.swift */, - 9C761E7723E1EBE00090FB56 /* ViewController.swift */, + 9C4AC87E23F1698B00BFF5E7 /* Controllers */, + 9C4AC88D23F1865800BFF5E7 /* Cell */, + 9C43514D23F2C12100FBFC58 /* Model */, 9C761E7923E1EBE00090FB56 /* Main.storyboard */, - 9CB6A6AE23E42F6D00891466 /* MyViewController.swift */, 9C761E7C23E1EBE10090FB56 /* Assets.xcassets */, 9C761E7E23E1EBE10090FB56 /* LaunchScreen.storyboard */, 9C761E8123E1EBE10090FB56 /* Info.plist */, @@ -141,10 +189,18 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9C761E7823E1EBE00090FB56 /* ViewController.swift in Sources */, + 9C4AC87323F161CB00BFF5E7 /* LoginFormController.swift in Sources */, + 9C4AC88C23F1864B00BFF5E7 /* FriendsCollectionCell.swift in Sources */, + 9C4AC89123F1B19B00BFF5E7 /* FriendCollectionController.swift in Sources */, 9C761E7423E1EBE00090FB56 /* AppDelegate.swift in Sources */, - 9CB6A6AF23E42F6D00891466 /* MyViewController.swift in Sources */, + 9C4AC88A23F1858000BFF5E7 /* GroupsCell.swift in Sources */, + 9C4AC87723F165E300BFF5E7 /* FriendsTableViewController.swift in Sources */, 9C761E7623E1EBE00090FB56 /* SceneDelegate.swift in Sources */, + 9C4AC87D23F168BC00BFF5E7 /* AllGroupsTableController.swift in Sources */, + 9C4AC88F23F1A0ED00BFF5E7 /* friendsStruct.swift in Sources */, + 9C4AC87923F167FF00BFF5E7 /* SubscriptionTableViewController.swift in Sources */, + 9C4AC88823F1855000BFF5E7 /* FriendsCell.swift in Sources */, + 9C43514C23F2A79000FBFC58 /* Groups.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/lesson-01/loginForm.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/lesson-03/loginForm.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from lesson-01/loginForm.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to lesson-03/loginForm.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/lesson-01/loginForm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/lesson-03/loginForm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from lesson-01/loginForm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to lesson-03/loginForm.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/lesson-01/loginForm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/lesson-03/loginForm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from lesson-01/loginForm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to lesson-03/loginForm.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/lesson-01/loginForm/AppDelegate.swift b/lesson-03/loginForm/AppDelegate.swift similarity index 100% rename from lesson-01/loginForm/AppDelegate.swift rename to lesson-03/loginForm/AppDelegate.swift diff --git a/lesson-03/loginForm/Assets.xcassets/1111.imageset/1111.jpg b/lesson-03/loginForm/Assets.xcassets/1111.imageset/1111.jpg new file mode 100644 index 0000000..2065c1b Binary files /dev/null and b/lesson-03/loginForm/Assets.xcassets/1111.imageset/1111.jpg differ diff --git a/lesson-03/loginForm/Assets.xcassets/1111.imageset/Contents.json b/lesson-03/loginForm/Assets.xcassets/1111.imageset/Contents.json new file mode 100644 index 0000000..43bd984 --- /dev/null +++ b/lesson-03/loginForm/Assets.xcassets/1111.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "1111.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/lesson-01/loginForm/Assets.xcassets/AppIcon.appiconset/Contents.json b/lesson-03/loginForm/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from lesson-01/loginForm/Assets.xcassets/AppIcon.appiconset/Contents.json rename to lesson-03/loginForm/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/lesson-03/loginForm/Assets.xcassets/Ben.imageset/Ben.jpg b/lesson-03/loginForm/Assets.xcassets/Ben.imageset/Ben.jpg new file mode 100644 index 0000000..c604339 Binary files /dev/null and b/lesson-03/loginForm/Assets.xcassets/Ben.imageset/Ben.jpg differ diff --git a/lesson-03/loginForm/Assets.xcassets/Ben.imageset/Contents.json b/lesson-03/loginForm/Assets.xcassets/Ben.imageset/Contents.json new file mode 100644 index 0000000..4e4ba40 --- /dev/null +++ b/lesson-03/loginForm/Assets.xcassets/Ben.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Ben.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/lesson-01/loginForm/Assets.xcassets/Contents.json b/lesson-03/loginForm/Assets.xcassets/Contents.json similarity index 100% rename from lesson-01/loginForm/Assets.xcassets/Contents.json rename to lesson-03/loginForm/Assets.xcassets/Contents.json diff --git a/lesson-03/loginForm/Assets.xcassets/Jessica.imageset/Contents.json b/lesson-03/loginForm/Assets.xcassets/Jessica.imageset/Contents.json new file mode 100644 index 0000000..862740c --- /dev/null +++ b/lesson-03/loginForm/Assets.xcassets/Jessica.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Jessica.jpeg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/lesson-03/loginForm/Assets.xcassets/Jessica.imageset/Jessica.jpeg b/lesson-03/loginForm/Assets.xcassets/Jessica.imageset/Jessica.jpeg new file mode 100644 index 0000000..d11bad6 Binary files /dev/null and b/lesson-03/loginForm/Assets.xcassets/Jessica.imageset/Jessica.jpeg differ diff --git a/lesson-03/loginForm/Assets.xcassets/Jony.imageset/Contents.json b/lesson-03/loginForm/Assets.xcassets/Jony.imageset/Contents.json new file mode 100644 index 0000000..69ade85 --- /dev/null +++ b/lesson-03/loginForm/Assets.xcassets/Jony.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Jony.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/lesson-03/loginForm/Assets.xcassets/Jony.imageset/Jony.jpg b/lesson-03/loginForm/Assets.xcassets/Jony.imageset/Jony.jpg new file mode 100644 index 0000000..64a2546 Binary files /dev/null and b/lesson-03/loginForm/Assets.xcassets/Jony.imageset/Jony.jpg differ diff --git a/lesson-03/loginForm/Assets.xcassets/party.imageset/Contents.json b/lesson-03/loginForm/Assets.xcassets/party.imageset/Contents.json new file mode 100644 index 0000000..0a8fb08 --- /dev/null +++ b/lesson-03/loginForm/Assets.xcassets/party.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "party.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/lesson-03/loginForm/Assets.xcassets/party.imageset/party.jpg b/lesson-03/loginForm/Assets.xcassets/party.imageset/party.jpg new file mode 100644 index 0000000..493f240 Binary files /dev/null and b/lesson-03/loginForm/Assets.xcassets/party.imageset/party.jpg differ diff --git "a/lesson-03/loginForm/Assets.xcassets/\320\223\320\273\320\260\320\267\320\2601.imageset/Contents.json" "b/lesson-03/loginForm/Assets.xcassets/\320\223\320\273\320\260\320\267\320\2601.imageset/Contents.json" new file mode 100644 index 0000000..30703b0 --- /dev/null +++ "b/lesson-03/loginForm/Assets.xcassets/\320\223\320\273\320\260\320\267\320\2601.imageset/Contents.json" @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Глаза1.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git "a/lesson-03/loginForm/Assets.xcassets/\320\223\320\273\320\260\320\267\320\2601.imageset/\320\223\320\273\320\260\320\267\320\2601.jpg" "b/lesson-03/loginForm/Assets.xcassets/\320\223\320\273\320\260\320\267\320\2601.imageset/\320\223\320\273\320\260\320\267\320\2601.jpg" new file mode 100644 index 0000000..c19ac09 Binary files /dev/null and "b/lesson-03/loginForm/Assets.xcassets/\320\223\320\273\320\260\320\267\320\2601.imageset/\320\223\320\273\320\260\320\267\320\2601.jpg" differ diff --git "a/lesson-03/loginForm/Assets.xcassets/\320\263\320\265\320\277\320\260\321\200\320\264.imageset/Contents.json" "b/lesson-03/loginForm/Assets.xcassets/\320\263\320\265\320\277\320\260\321\200\320\264.imageset/Contents.json" new file mode 100644 index 0000000..36f933f --- /dev/null +++ "b/lesson-03/loginForm/Assets.xcassets/\320\263\320\265\320\277\320\260\321\200\320\264.imageset/Contents.json" @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "гепард.jpeg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git "a/lesson-03/loginForm/Assets.xcassets/\320\263\320\265\320\277\320\260\321\200\320\264.imageset/\320\263\320\265\320\277\320\260\321\200\320\264.jpeg" "b/lesson-03/loginForm/Assets.xcassets/\320\263\320\265\320\277\320\260\321\200\320\264.imageset/\320\263\320\265\320\277\320\260\321\200\320\264.jpeg" new file mode 100644 index 0000000..2e600f5 Binary files /dev/null and "b/lesson-03/loginForm/Assets.xcassets/\320\263\320\265\320\277\320\260\321\200\320\264.imageset/\320\263\320\265\320\277\320\260\321\200\320\264.jpeg" differ diff --git "a/lesson-03/loginForm/Assets.xcassets/\320\274\320\276\321\211\321\214.imageset/Contents.json" "b/lesson-03/loginForm/Assets.xcassets/\320\274\320\276\321\211\321\214.imageset/Contents.json" new file mode 100644 index 0000000..57cc4e0 --- /dev/null +++ "b/lesson-03/loginForm/Assets.xcassets/\320\274\320\276\321\211\321\214.imageset/Contents.json" @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "мощь.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git "a/lesson-03/loginForm/Assets.xcassets/\320\274\320\276\321\211\321\214.imageset/\320\274\320\276\321\211\321\214.jpg" "b/lesson-03/loginForm/Assets.xcassets/\320\274\320\276\321\211\321\214.imageset/\320\274\320\276\321\211\321\214.jpg" new file mode 100644 index 0000000..f0dc418 Binary files /dev/null and "b/lesson-03/loginForm/Assets.xcassets/\320\274\320\276\321\211\321\214.imageset/\320\274\320\276\321\211\321\214.jpg" differ diff --git "a/lesson-03/loginForm/Assets.xcassets/\320\274\321\213\321\210\321\214.imageset/Contents.json" "b/lesson-03/loginForm/Assets.xcassets/\320\274\321\213\321\210\321\214.imageset/Contents.json" new file mode 100644 index 0000000..0a552f3 --- /dev/null +++ "b/lesson-03/loginForm/Assets.xcassets/\320\274\321\213\321\210\321\214.imageset/Contents.json" @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "мышь.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git "a/lesson-03/loginForm/Assets.xcassets/\320\274\321\213\321\210\321\214.imageset/\320\274\321\213\321\210\321\214.jpg" "b/lesson-03/loginForm/Assets.xcassets/\320\274\321\213\321\210\321\214.imageset/\320\274\321\213\321\210\321\214.jpg" new file mode 100644 index 0000000..4e0f80b Binary files /dev/null and "b/lesson-03/loginForm/Assets.xcassets/\320\274\321\213\321\210\321\214.imageset/\320\274\321\213\321\210\321\214.jpg" differ diff --git "a/lesson-03/loginForm/Assets.xcassets/\321\201\320\277\321\200\320\260\320\262.imageset/Contents.json" "b/lesson-03/loginForm/Assets.xcassets/\321\201\320\277\321\200\320\260\320\262.imageset/Contents.json" new file mode 100644 index 0000000..74a0851 --- /dev/null +++ "b/lesson-03/loginForm/Assets.xcassets/\321\201\320\277\321\200\320\260\320\262.imageset/Contents.json" @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "справ.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git "a/lesson-03/loginForm/Assets.xcassets/\321\201\320\277\321\200\320\260\320\262.imageset/\321\201\320\277\321\200\320\260\320\262.jpg" "b/lesson-03/loginForm/Assets.xcassets/\321\201\320\277\321\200\320\260\320\262.imageset/\321\201\320\277\321\200\320\260\320\262.jpg" new file mode 100644 index 0000000..126a81e Binary files /dev/null and "b/lesson-03/loginForm/Assets.xcassets/\321\201\320\277\321\200\320\260\320\262.imageset/\321\201\320\277\321\200\320\260\320\262.jpg" differ diff --git "a/lesson-03/loginForm/Assets.xcassets/\321\202\321\200\320\260\320\275\321\210\320\265\321\217.imageset/Contents.json" "b/lesson-03/loginForm/Assets.xcassets/\321\202\321\200\320\260\320\275\321\210\320\265\321\217.imageset/Contents.json" new file mode 100644 index 0000000..92d45c8 --- /dev/null +++ "b/lesson-03/loginForm/Assets.xcassets/\321\202\321\200\320\260\320\275\321\210\320\265\321\217.imageset/Contents.json" @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "траншея.jpg", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git "a/lesson-03/loginForm/Assets.xcassets/\321\202\321\200\320\260\320\275\321\210\320\265\321\217.imageset/\321\202\321\200\320\260\320\275\321\210\320\265\321\217.jpg" "b/lesson-03/loginForm/Assets.xcassets/\321\202\321\200\320\260\320\275\321\210\320\265\321\217.imageset/\321\202\321\200\320\260\320\275\321\210\320\265\321\217.jpg" new file mode 100644 index 0000000..fe538f7 Binary files /dev/null and "b/lesson-03/loginForm/Assets.xcassets/\321\202\321\200\320\260\320\275\321\210\320\265\321\217.imageset/\321\202\321\200\320\260\320\275\321\210\320\265\321\217.jpg" differ diff --git a/lesson-01/loginForm/Base.lproj/LaunchScreen.storyboard b/lesson-03/loginForm/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from lesson-01/loginForm/Base.lproj/LaunchScreen.storyboard rename to lesson-03/loginForm/Base.lproj/LaunchScreen.storyboard diff --git a/lesson-02/loginForm/Base.lproj/Main.storyboard b/lesson-03/loginForm/Base.lproj/Main.storyboard similarity index 65% rename from lesson-02/loginForm/Base.lproj/Main.storyboard rename to lesson-03/loginForm/Base.lproj/Main.storyboard index 5b7e2d0..263291f 100644 --- a/lesson-02/loginForm/Base.lproj/Main.storyboard +++ b/lesson-03/loginForm/Base.lproj/Main.storyboard @@ -25,10 +25,10 @@ - + - + @@ -57,7 +57,7 @@ - +