ADDED SegmentControl

Эван Крошкин · Эван Крошкин · commit b78a13c169a1 · 2022-02-27T19:32:01.000+03:00
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -0,0 +1,95 @@
+included:
+  - Source
+  - Tests
+  - /Users/ivantsvetkov/Desktop/Task4 
+excluded:
+  - Pods
+  - Tests/SwiftLintFrameworkTests/Resources
+analyzer_rules:
+  - unused_declaration
+  - unused_import
+line_length: 200
+object_literal:
+    color_literal: false
+    image_literal: false
+opt_in_rules:
+  - anyobject_protocol
+  - array_init
+  - attributes
+  - closure_end_indentation
+  - closure_spacing
+  - collection_alignment
+  - contains_over_filter_count
+  - contains_over_filter_is_empty
+  - contains_over_first_not_nil
+  - contains_over_range_nil_comparison
+  - discouraged_none_name
+  - discouraged_object_literal
+  - empty_collection_literal
+  - empty_count
+  - empty_string
+  - empty_xctest_method
+  - enum_case_associated_values_count
+  - explicit_init
+  - extension_access_modifier
+  - fallthrough
+  - fatal_error_message
+  - file_header
+  - file_name
+  - first_where
+  - flatmap_over_map_reduce
+  - identical_operands
+  - joined_default_parameter
+  - last_where
+  - legacy_multiple
+  - legacy_random
+  - literal_expression_end_indentation
+  - lower_acl_than_parent
+  - modifier_order
+  - nimble_operator
+  - nslocalizedstring_key
+  - number_separator
+  - object_literal
+  - operator_usage_whitespace
+  - overridden_super_call
+  - override_in_extension
+  - pattern_matching_keywords
+  - prefer_self_in_static_references
+  - prefer_self_type_over_type_of_self
+  - private_action
+  - private_outlet
+  - prohibited_interface_builder
+  - prohibited_super_call
+  - quick_discouraged_call
+  - quick_discouraged_focused_test
+  - quick_discouraged_pending_test
+  - reduce_into
+  - redundant_nil_coalescing
+  - redundant_type_annotation
+  - single_test_class
+  - sorted_first_last
+  - sorted_imports
+  - static_operator
+  - strong_iboutlet
+  - test_case_accessibility
+  - toggle_bool
+  - unavailable_function
+  - unneeded_parentheses_in_closure_argument
+  - unowned_variable_capture
+  - untyped_error_in_catch
+  - vertical_parameter_alignment_on_call
+  - xct_specific_matcher
+  - yoda_condition
+identifier_name:
+  excluded:
+    - id
+number_separator:
+  minimum_length: 5
+file_name:
+  excluded:
+    - main.swift
+    - LinuxMain.swift
+    - TestHelpers.swift
+    - shim.swift
+    - AutomaticRuleTests.generated.swift
+
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/SnapKit/Source/LayoutConstraintItem.swift b/Pods/SnapKit/Source/LayoutConstraintItem.swift
diff --git a/Task4.xcodeproj/project.pbxproj b/Task4.xcodeproj/project.pbxproj
@@ -7,24 +7,34 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		BC5F4AA827CBBD5400E82425 /* MapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC5F4AA727CBBD5400E82425 /* MapViewController.swift */; };
+		BC5F4AAA27CBBD8200E82425 /* ClientAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC5F4AA927CBBD8200E82425 /* ClientAPI.swift */; };
+		BC5F4AAC27CBC72F00E82425 /* ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC5F4AAB27CBC72F00E82425 /* ListViewController.swift */; };
+		BC5F4AAE27CBCE1200E82425 /* UIViewController + Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC5F4AAD27CBCE1200E82425 /* UIViewController + Ext.swift */; };
 		BC69EBB827C4FD07006D85DD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC69EBB727C4FD07006D85DD /* AppDelegate.swift */; };
 		BC69EBBA27C4FD07006D85DD /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC69EBB927C4FD07006D85DD /* SceneDelegate.swift */; };
 		BC69EBBC27C4FD07006D85DD /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC69EBBB27C4FD07006D85DD /* MainViewController.swift */; };
 		BC69EBC127C4FD09006D85DD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BC69EBC027C4FD09006D85DD /* Assets.xcassets */; };
 		BC69EBC427C4FD09006D85DD /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC69EBC227C4FD09006D85DD /* LaunchScreen.storyboard */; };
+		BC8E922127CACA41006B1B3C /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = BC8E922027CACA41006B1B3C /* .swiftlint.yml */; };
 		E18108920768AA2DDA77B8FD /* Pods_Task4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65E19019E5D0DB8FB342C934 /* Pods_Task4.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		65E19019E5D0DB8FB342C934 /* Pods_Task4.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Task4.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		9CA093AA9384F4B4514F05B6 /* Pods-Task4.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Task4.debug.xcconfig"; path = "Target Support Files/Pods-Task4/Pods-Task4.debug.xcconfig"; sourceTree = "<group>"; };
+		BC5F4AA727CBBD5400E82425 /* MapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapViewController.swift; sourceTree = "<group>"; };
+		BC5F4AA927CBBD8200E82425 /* ClientAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientAPI.swift; sourceTree = "<group>"; };
+		BC5F4AAB27CBC72F00E82425 /* ListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListViewController.swift; sourceTree = "<group>"; };
+		BC5F4AAD27CBCE1200E82425 /* UIViewController + Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController + Ext.swift"; sourceTree = "<group>"; };
 		BC69EBB427C4FD07006D85DD /* Task4.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Task4.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		BC69EBB727C4FD07006D85DD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		BC69EBB927C4FD07006D85DD /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
 		BC69EBBB27C4FD07006D85DD /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
 		BC69EBC027C4FD09006D85DD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		BC69EBC327C4FD09006D85DD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		BC69EBC527C4FD09006D85DD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		BC8E922027CACA41006B1B3C /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = .swiftlint.yml; sourceTree = "<group>"; };
 		D16CC7566D75C8D69C33F212 /* Pods-Task4.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Task4.release.xcconfig"; path = "Target Support Files/Pods-Task4/Pods-Task4.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -46,7 +56,6 @@
 				9CA093AA9384F4B4514F05B6 /* Pods-Task4.debug.xcconfig */,
 				D16CC7566D75C8D69C33F212 /* Pods-Task4.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -61,6 +70,7 @@
 		BC69EBAB27C4FD06006D85DD = {
 			isa = PBXGroup;
 			children = (
+				BC8E922027CACA41006B1B3C /* .swiftlint.yml */,
 				BC69EBB627C4FD07006D85DD /* Task4 */,
 				BC69EBB527C4FD07006D85DD /* Products */,
 				458A7B5C9688074B2F4AB2A8 /* Pods */,
@@ -82,6 +92,10 @@
 				BC69EBB727C4FD07006D85DD /* AppDelegate.swift */,
 				BC69EBB927C4FD07006D85DD /* SceneDelegate.swift */,
 				BC69EBBB27C4FD07006D85DD /* MainViewController.swift */,
+				BC5F4AA727CBBD5400E82425 /* MapViewController.swift */,
+				BC5F4AAB27CBC72F00E82425 /* ListViewController.swift */,
+				BC5F4AAD27CBCE1200E82425 /* UIViewController + Ext.swift */,
+				BC5F4AA927CBBD8200E82425 /* ClientAPI.swift */,
 				BC69EBC027C4FD09006D85DD /* Assets.xcassets */,
 				BC69EBC227C4FD09006D85DD /* LaunchScreen.storyboard */,
 				BC69EBC527C4FD09006D85DD /* Info.plist */,
@@ -150,6 +164,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				BC8E922127CACA41006B1B3C /* .swiftlint.yml in Resources */,
 				BC69EBC427C4FD09006D85DD /* LaunchScreen.storyboard in Resources */,
 				BC69EBC127C4FD09006D85DD /* Assets.xcassets in Resources */,
 			);
@@ -223,7 +238,11 @@
 			files = (
 				BC69EBBC27C4FD07006D85DD /* MainViewController.swift in Sources */,
 				BC69EBB827C4FD07006D85DD /* AppDelegate.swift in Sources */,
+				BC5F4AAE27CBCE1200E82425 /* UIViewController + Ext.swift in Sources */,
+				BC5F4AAC27CBC72F00E82425 /* ListViewController.swift in Sources */,
 				BC69EBBA27C4FD07006D85DD /* SceneDelegate.swift in Sources */,
+				BC5F4AAA27CBBD8200E82425 /* ClientAPI.swift in Sources */,
+				BC5F4AA827CBBD5400E82425 /* MapViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Task4.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Task4.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Task4/AppDelegate.swift b/Task4/AppDelegate.swift
@@ -10,4 +10,3 @@ import UIKit
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
 }
-
diff --git a/Task4/ClientAPI.swift b/Task4/ClientAPI.swift
@@ -0,0 +1,8 @@
+//
+//  ClientAPI.swift
+//  Task4
+//
+//  Created by Эван Крошкин on 27.02.22.
+//
+
+import Foundation
diff --git a/Task4/ListViewController.swift b/Task4/ListViewController.swift
@@ -0,0 +1,17 @@
+//
+//  ListViewController.swift
+//  Task4
+//
+//  Created by Эван Крошкин on 27.02.22.
+//
+
+import UIKit
+import SnapKit
+
+class ListViewController: UIViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .blue
+    }
+}
diff --git a/Task4/MainViewController.swift b/Task4/MainViewController.swift
@@ -6,13 +6,75 @@
 //
 
 import UIKit
+import SnapKit
 
 class MainViewController: UIViewController {
-
+    private lazy var segmentedControl: UISegmentedControl = {
+        let segmentedControl = UISegmentedControl()
+        segmentedControl.backgroundColor = .lightGray
+        segmentedControl.insertSegment(withTitle: "Map", at: 0, animated: true)
+        segmentedControl.insertSegment(withTitle: "List", at: 1, animated: true)
+        segmentedControl.selectedSegmentIndex = 2
+        return segmentedControl
+    }()
+    
+    private lazy var contentView: UIView = {
+        let view = UIView()
+        return view
+    }()
+    
+    private lazy var mapViewController: MapViewController = {
+        var viewController = MapViewController()
+        self.set(view: contentView, viewController)
+        return viewController
+    }()
+    
+    private lazy var listViewController: ListViewController = {
+        var viewController = ListViewController()
+        self.set(view: contentView, viewController)
+        return viewController
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        segmentedControl.addTarget(self,
+                                   action: #selector(segmentAction(_:)),
+                                   for: .valueChanged)
+        setupVCs()
+    }
+    
+    private func setupVCs() {
+        view.addSubview(segmentedControl)
+        view.addSubview(contentView)
+        view.backgroundColor = .gray
+        setDefaultSegment()
+        segmentedControl.snp.makeConstraints { make in
+            make.top.equalTo(view.safeAreaLayoutGuide.snp.top)
+            make.leading.equalToSuperview()
+            make.trailing.equalToSuperview()
+        }
+        contentView.snp.makeConstraints { make in
+            make.top.equalTo(segmentedControl.snp.bottom)
+            make.leading.equalToSuperview()
+            make.trailing.equalToSuperview()
+            make.bottom.equalToSuperview()
+        }
+    }
+    
+    private func setDefaultSegment() {
+        self.changeVCs(view: contentView, mapViewController, listViewController)
+            navigationController?.navigationBar.topItem?.title = "MAP ATMs"
+    }
+    
+    @objc func segmentAction(_ segmentedControl: UISegmentedControl) {
+        switch (segmentedControl.selectedSegmentIndex) {
+        case 0:
+            setDefaultSegment()
+        case 1:
+            self.changeVCs(view: contentView, listViewController, mapViewController)
+            navigationController?.navigationBar.topItem?.title = "LIST ATMs"
+        default:
+            break
+        }
     }
-
-
 }
-
diff --git a/Task4/MapViewController.swift b/Task4/MapViewController.swift
@@ -0,0 +1,17 @@
+//
+//  MapViewController.swift
+//  Task4
+//
+//  Created by Эван Крошкин on 27.02.22.
+//
+
+import UIKit
+import SnapKit
+
+class MapViewController: UIViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .yellow
+    }
+}
diff --git a/Task4/SceneDelegate.swift b/Task4/SceneDelegate.swift
diff --git a/Task4/UIViewController + Ext.swift b/Task4/UIViewController + Ext.swift

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,3 @@ import UIKit`
`10`	`10`	`@main`
`11`	`11`	`class AppDelegate: UIResponder, UIApplicationDelegate {`
`12`	`12`	`}`
`13`		`-`