13.07

Dmitriy Tymofyeyev
1 parent 42242b55
Showing 9 changed files with 84 additions and 60 deletions
InterQR-Internship.xcodeproj/project.pbxproj
InterQR-Internship/Constants.swift
InterQR-Internship/Modules/OneTimePasswordScreen/ViewController/CodeVerificationViewController.swift
InterQR-Internship/Modules/ResidentsScreen/View/ResidentTableViewCell/ResidentTableViewCell.swift
InterQR-Internship/Modules/ResidentsScreen/ViewController/ResidentsViewController.swift
InterQR-Internship/Modules/SettingsScreen/ViewController/SettingsViewController.swift
InterQR-Internship/Modules/VerificationSceen/ViewController/VerificationViewController.swift
InterQR-Internship/NetworkManager/AuthNetworkManager.swift
Resources/Localizable.strings
--- a/InterQR-Internship.xcodeproj/project.pbxproj
View file @fce9cac
+++ b/InterQR-Internship.xcodeproj/project.pbxproj
View file @fce9cac
@@ -7,7 +7,6 @@
 	objects = {
 /* Begin PBXBuildFile section */
-		008858E128786A5B00B23E08 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 008858DF28786A5B00B23E08 /* Localizable.strings */; };
 		00A48B62285F8CDD00EF0A08 /* CodeVerificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A48B5F285F8CDD00EF0A08 /* CodeVerificationView.swift */; };
 		00A48B63285F8CDD00EF0A08 /* CodeVerificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A48B61285F8CDD00EF0A08 /* CodeVerificationViewController.swift */; };
 		00A48B6A285F8CEA00EF0A08 /* AddResidentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A48B66285F8CEA00EF0A08 /* AddResidentsView.swift */; };
@@ -21,6 +20,7 @@
 		00A48B7B285F8F6600EF0A08 /* ProtocolDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A48B79285F8F6600EF0A08 /* ProtocolDelegate.swift */; };
 		00A48B7F285F8F9200EF0A08 /* ContactPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A48B7E285F8F9200EF0A08 /* ContactPickerViewController.swift */; };
 		00E581BB284F71CD00E779FB /* Checkbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E581BA284F71CD00E779FB /* Checkbox.swift */; };
+		170E2C45287C434500296FC9 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 170E2C44287C434500296FC9 /* Localizable.strings */; };
 		1721AEF028704E3100EC4FDB /* Strings + Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1721AEEF28704E3100EC4FDB /* Strings + Extension.swift */; };
 		1721AEF228705FD600EC4FDB /* OTPView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1721AEF128705FD600EC4FDB /* OTPView.swift */; };
 		17287C602848AD8D00AA7113 /* Fonts + Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17287C5F2848AD8D00AA7113 /* Fonts + Extension.swift */; };
@@ -59,7 +59,6 @@
 /* Begin PBXFileReference section */
 		008858DC287869A100B23E08 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
-		008858E028786A5B00B23E08 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = "InterQR-Internship/Base.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; };
 		00A48B5F285F8CDD00EF0A08 /* CodeVerificationView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CodeVerificationView.swift; sourceTree = "<group>"; };
 		00A48B61285F8CDD00EF0A08 /* CodeVerificationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CodeVerificationViewController.swift; sourceTree = "<group>"; };
 		00A48B66285F8CEA00EF0A08 /* AddResidentsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddResidentsView.swift; sourceTree = "<group>"; };
@@ -73,6 +72,7 @@
 		00A48B79285F8F6600EF0A08 /* ProtocolDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProtocolDelegate.swift; sourceTree = "<group>"; };
 		00A48B7E285F8F9200EF0A08 /* ContactPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactPickerViewController.swift; sourceTree = "<group>"; };
 		00E581BA284F71CD00E779FB /* Checkbox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Checkbox.swift; sourceTree = "<group>"; };
+		170E2C44287C434500296FC9 /* Localizable.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = Localizable.strings; sourceTree = "<group>"; };
 		1721AEEF28704E3100EC4FDB /* Strings + Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Strings + Extension.swift"; sourceTree = "<group>"; };
 		1721AEF128705FD600EC4FDB /* OTPView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OTPView.swift; sourceTree = "<group>"; };
 		17287C5F2848AD8D00AA7113 /* Fonts + Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Fonts + Extension.swift"; sourceTree = "<group>"; };
@@ -527,7 +527,7 @@
 		17FD60D82848A2CE00957A3A /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				008858DF28786A5B00B23E08 /* Localizable.strings */,
+				170E2C44287C434500296FC9 /* Localizable.strings */,
 				17FD60D92848A56900957A3A /* Fonts */,
 			);
 			path = Resources;
@@ -622,8 +622,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				17CF9EED2844ED90000D8077 /* LaunchScreen.storyboard in Resources */,
-				008858E128786A5B00B23E08 /* Localizable.strings in Resources */,
 				17287C6D2848C69600AA7113 /* Sk-Modernist-Mono.otf in Resources */,
+				170E2C45287C434500296FC9 /* Localizable.strings in Resources */,
 				17287C692848C69600AA7113 /* Sk-Modernist-Bold.otf in Resources */,
 				17287C6A2848C69600AA7113 /* Sk-Modernist-Regular.otf in Resources */,
 				17CF9EEA2844ED90000D8077 /* Assets.xcassets in Resources */,
@@ -726,14 +726,6 @@
 /* End PBXSourcesBuildPhase section */
 /* Begin PBXVariantGroup section */
-		008858DF28786A5B00B23E08 /* Localizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				008858E028786A5B00B23E08 /* Base */,
-			);
-			name = Localizable.strings;
-			sourceTree = "<group>";
-		};
 		17CF9EEB2844ED90000D8077 /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -873,7 +865,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 52KCA3JZ59;
+				DEVELOPMENT_TEAM = 4X46JG9W6V;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "InterQR-Internship/Info.plist";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -902,7 +894,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 52KCA3JZ59;
+				DEVELOPMENT_TEAM = 4X46JG9W6V;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "InterQR-Internship/Info.plist";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
--- a/InterQR-Internship/Constants.swift
View file @fce9cac
+++ b/InterQR-Internship/Constants.swift
View file @fce9cac
@@ -8,26 +8,29 @@
 import Foundation
 struct Constants {
-    enum APIRoutes {
-        case initURL
-        case startURL
-        case verifyURL
-        case loginURL
-        case logoutURL
+    static let baseURL = "https://www.interqr.com"
+}
+
+enum APIRoutes {
+    case initURL
+    case startURL
+    case verifyURL
+    case loginURL
+    case logoutURL
+    
+    var urlString: String {
+        switch self {
-        var urlString: String {
-            switch self {
-            case .initURL:
-                return "https://www.interqr.com/api/init"
-            case .startURL:
-                return "https://www.interqr.com/api/twofa/start"
-            case .verifyURL:
-                return "https://www.interqr.com/api/twofa/verify"
-            case .loginURL:
-                return "https://www.interqr.com/api/login"
-            case .logoutURL:
-                return "https://www.interqr.com/api/logout"
-            }
+        case .initURL:
+            return "/api/init"
+        case .startURL:
+            return "/api/twofa/start"
+        case .verifyURL:
+            return "/api/twofa/verify"
+        case .loginURL:
+            return "/api/login"
+        case .logoutURL:
+            return "/api/logout"
         }
     }
 }
--- a/InterQR-Internship/Modules/OneTimePasswordScreen/ViewController/CodeVerificationViewController.swift
View file @fce9cac
+++ b/InterQR-Internship/Modules/OneTimePasswordScreen/ViewController/CodeVerificationViewController.swift
View file @fce9cac
@@ -37,7 +37,7 @@ class CodeVerificationViewController: UIViewController {
     }
     func networkingVerify() {
-        guard let verifyUrl = URL(string: Constants.APIRoutes.verifyURL.urlString) else { return }
+        guard let verifyUrl = URL(string: APIRoutes.verifyURL.urlString) else { return }
         let verifyModel = verifyModelFilling()
         AuthNetworkManager.share.verifyRequest(verifyUrl, model: verifyModel!) { response in
             print("3️⃣✅\(response.data)")
@@ -50,7 +50,7 @@ class CodeVerificationViewController: UIViewController {
     }
     func networkingLogin() {
-        guard let loginUrl = URL(string: Constants.APIRoutes.loginURL.urlString) else { return }
+        guard let loginUrl = URL(string: APIRoutes.loginURL.urlString) else { return }
         guard let loginModel = loginModelFilling() else { return }
         self.networkManager.loginRequest(loginUrl, model: loginModel) { response in
--- a/InterQR-Internship/Modules/ResidentsScreen/View/ResidentTableViewCell/ResidentTableViewCell.swift
View file @fce9cac
+++ b/InterQR-Internship/Modules/ResidentsScreen/View/ResidentTableViewCell/ResidentTableViewCell.swift
View file @fce9cac
@@ -12,7 +12,6 @@ protocol ResidentTableViewCellDelegate: AnyObject {
     func didManagerButtonTapped(cell: ResidentTableViewCell)
     func didHiddenButtonTapped(cell: ResidentTableViewCell)
     func didHeardButtonTapped(cell: ResidentTableViewCell)
-
 }
 class ResidentTableViewCell: UITableViewCell {
@@ -89,7 +88,7 @@ class ResidentTableViewCell: UITableViewCell {
     }()
     var heartButton: UIButton = {
-        var obj = UIButton(type: .system)
+        var obj = UIButton()
         obj.setImage(UIImage(named: .Image.heart), for: .normal)
         obj.setImage(UIImage(named: .Image.heartRed), for: .selected)
         return obj
@@ -184,6 +183,9 @@ class ResidentTableViewCell: UITableViewCell {
         }
         removeCellButton.addTarget(self, action: #selector(didRemoveButtonTapped(_:)), for: .touchUpInside)
+        managerButton.addTarget(self, action: #selector(didButtonsTapped(_:)), for: .touchUpInside)
+        hiddenButton.addTarget(self, action: #selector(didButtonsTapped(_:)), for: .touchUpInside)
+        heartButton.addTarget(self, action: #selector(didButtonsTapped(_:)), for: .touchUpInside)
     }
     override func layoutSubviews() {
@@ -198,4 +200,10 @@ extension ResidentTableViewCell {
     @objc private func didRemoveButtonTapped(_ sender: UIButton) {
         delegate?.didRemoveButtonTapped(cell: self)
     }
+    
+    @objc private func didButtonsTapped(_ sender: UIButton) {
+        delegate?.didManagerButtonTapped(cell: self)
+        delegate?.didHiddenButtonTapped(cell: self)
+        delegate?.didHeardButtonTapped(cell: self)
+    }
 }
--- a/InterQR-Internship/Modules/ResidentsScreen/ViewController/ResidentsViewController.swift
View file @fce9cac
+++ b/InterQR-Internship/Modules/ResidentsScreen/ViewController/ResidentsViewController.swift
View file @fce9cac
@@ -47,9 +47,9 @@ class ResidentsViewController: UIViewController {
     }
     func networking() {
-        guard let initUrl = URL(string: Constants.APIRoutes.initURL.urlString) else { return }
+        guard let initUrl = URL(string: APIRoutes.initURL.urlString) else { return }
         guard let model = modelFilling() else { return }
-        networkManager.initRequest(initUrl, model: model) { responseModel in
+        networkManager.initRequest(initUrl, completion: (InitResponseModel) -> Void, model: model) { responseModel in
             print("1️⃣✅\(responseModel.message)✅")
         } fail: { error in
             print("1️⃣\(error)")
@@ -84,19 +84,19 @@ extension ResidentsViewController: UITableViewDelegate, UITableViewDataSource {
         return cell
     }
-    @objc private func removeCell(_ sender: UIButton) {
-        myData.remove(at: sender.tag)
-        mainView.tableView.deleteRows(at: [IndexPath(row: sender.tag, section: 0)], with: .fade)
-        mainView.tableView.reloadData()
-    }
+//    @objc private func removeCell(_ sender: UIButton) {
+//        myData.remove(at: sender.tag)
+//        mainView.tableView.deleteRows(at: [IndexPath(row: sender.tag, section: 0)], with: .fade)
+//        mainView.tableView.reloadData()
+//    }
-    @objc private func didTapManagerButton(_ sender: UIButton) {
-        if !sender.isSelected {
-            sender.isSelected = true
-        } else {
-            sender.isSelected = false
-        }
-    }
+//    @objc private func didTapManagerButton(_ sender: UIButton) {
+//        if !sender.isSelected {
+//            sender.isSelected = true
+//        } else {
+//            sender.isSelected = false
+//        }
+//    }
 }
 //MARK: - ResidentSavable delegate
 extension ResidentsViewController: ResidentSavable {
@@ -116,17 +116,31 @@ extension ResidentsViewController: ResidentTableViewCellDelegate {
         mainView.tableView.reloadData()
     }
+    func didButtonsTapped(_ sender: UIButton) {
+        
+    }
+    
     func didManagerButtonTapped(cell: ResidentTableViewCell) {
-        print("")
+        if !cell.managerButton.isSelected {
+            cell.managerButton.isSelected = true
+        } else {
+            cell.managerButton.isSelected = false
+        }
     }
     func didHiddenButtonTapped(cell: ResidentTableViewCell) {
-        print("")
+        if !cell.hiddenButton.isSelected {
+            cell.hiddenButton.isSelected = true
+        } else {
+            cell.hiddenButton.isSelected = false
+        }
     }
     func didHeardButtonTapped(cell: ResidentTableViewCell) {
-        print("")
+        if !cell.heartButton.isSelected {
+            cell.heartButton.isSelected = true
+        } else {
+            cell.heartButton.isSelected = false
+        }
     }
-    
-    
 }
--- a/InterQR-Internship/Modules/SettingsScreen/ViewController/SettingsViewController.swift
View file @fce9cac
+++ b/InterQR-Internship/Modules/SettingsScreen/ViewController/SettingsViewController.swift
View file @fce9cac
@@ -46,7 +46,7 @@ extension SettingsViewController {
     }
     func networking() {
-        guard let logoutUrl = URL(string: Constants.APIRoutes.logoutURL.urlString) else { return }
+        guard let logoutUrl = URL(string: APIRoutes.logoutURL.urlString) else { return }
         guard let logoutModel = logoutModelFilling() else { return }
         networkManager.logoutRequest(logoutUrl, model: logoutModel) { response in
             print("5️⃣❇️\(response.message ?? "Data not received!")❇️")
--- a/InterQR-Internship/Modules/VerificationSceen/ViewController/VerificationViewController.swift
View file @fce9cac
+++ b/InterQR-Internship/Modules/VerificationSceen/ViewController/VerificationViewController.swift
View file @fce9cac
@@ -52,7 +52,7 @@ class VerificationViewController: UIViewController {
     }
     func networking() {
-        guard let startUrl = URL(string: Constants.APIRoutes.startURL.urlString) else { return }
+        guard let startUrl = URL(string: APIRoutes.startURL.urlString) else { return }
         guard let startModel = startModelFilling() else { return }
         networkManager.startRequest(startUrl, model: startModel) { response in
             print("2️⃣✅\(response.message)✅")
--- a/InterQR-Internship/NetworkManager/AuthNetworkManager.swift
View file @fce9cac
+++ b/InterQR-Internship/NetworkManager/AuthNetworkManager.swift
View file @fce9cac
@@ -31,7 +31,7 @@ class AuthNetworkManager {
     typealias FailedHandler = (Error) -> Void
-    func initRequest(_ url: URL, model: InitRequestModel, completion: @escaping InitWebServiceResponse, fail: @escaping FailedHandler) {
+    func initRequest(_ model: InitRequestModel, completion: @escaping (InitResponseModel) -> Void, fail: @escaping FailedHandler) {
         let params = ["device_uuid": model.deviceUUID,
                       "manufacturer": model.manufacturer,
@@ -40,7 +40,7 @@ class AuthNetworkManager {
                       "os_version": model.osVersion,
                       "app_version": model.appVersion] as [String: Any]
-        AF.request(url, method: .post, parameters: params, encoding: JSONEncoding.default).responseDecodable(of: InitResponseModel.self ) { response in
+        AF.request(Constants.baseURL + APIRoutes.initURL.urlString, method: .post, parameters: params, encoding: JSONEncoding.default).responseDecodable(of: InitResponseModel.self ) { response in
             if let error = response.error {
                 fail(error)
--- a/Resources/Localizable.strings 0 → 100644
View file @fce9cac
+++ b/Resources/Localizable.strings 0 → 100644
View file @fce9cac
+/* 
+  Localizable.strings
+  InterQR-Internship
+
+  Created by Дмитрий Тимофеев on 11.07.2022.
+  
+*/