From 9da1499588b4f7e8f074a8372710245a467e04f2 Mon Sep 17 00:00:00 2001 From: Anton Makarov Date: Fri, 19 Oct 2018 14:15:21 +0300 Subject: [PATCH 1/2] [NY-3737] IOS: 'Send' button should be disable on the 'sharing' user selector screen, if no one selected --- .../Presenter/ForwardSelectorPresenter.swift | 2 ++ .../View/ForwardSelectorViewController.swift | 1 + Nynja.xcodeproj/project.pbxproj | 16 ++++++++-------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Nynja-Share/UI/ForwardSelector/Presenter/ForwardSelectorPresenter.swift b/Nynja-Share/UI/ForwardSelector/Presenter/ForwardSelectorPresenter.swift index ccec990c5..03f9503b1 100644 --- a/Nynja-Share/UI/ForwardSelector/Presenter/ForwardSelectorPresenter.swift +++ b/Nynja-Share/UI/ForwardSelector/Presenter/ForwardSelectorPresenter.swift @@ -103,10 +103,12 @@ final class ForwardSelectorPresenter: ForwardSelectorPresenterProtocol, ForwardS func didFetchContacts(_ contacts: [ForwardTarget]) { view.setupForwardTargets(contacts, selected: self.selectedItems) + updateIsSendEnabled() } func didFetchGroups(_ groups: [ForwardTarget]) { view.setupForwardTargets(groups, selected: self.selectedItems) + updateIsSendEnabled() } func updateByState() { diff --git a/Nynja-Share/UI/ForwardSelector/View/ForwardSelectorViewController.swift b/Nynja-Share/UI/ForwardSelector/View/ForwardSelectorViewController.swift index 2c62b6667..758a0653f 100644 --- a/Nynja-Share/UI/ForwardSelector/View/ForwardSelectorViewController.swift +++ b/Nynja-Share/UI/ForwardSelector/View/ForwardSelectorViewController.swift @@ -44,6 +44,7 @@ final class ForwardSelectorViewController: UIViewController, ForwardSelectorView bottomActionsView.selectAction(at: 0) presenter.openGroups() } + listHeaderLabel.text = state.title } } diff --git a/Nynja.xcodeproj/project.pbxproj b/Nynja.xcodeproj/project.pbxproj index a4279caf2..3a557c25f 100644 --- a/Nynja.xcodeproj/project.pbxproj +++ b/Nynja.xcodeproj/project.pbxproj @@ -16672,8 +16672,8 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = "Nynja-Share/Resources/Nynja-Share.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 9GKQ5AMF2B; @@ -16685,8 +16685,8 @@ OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DSHARE_EXTENSION -Xfrontend -warn-long-expression-type-checking=20 -Xfrontend -warn-long-function-bodies=20"; PRODUCT_BUNDLE_IDENTIFIER = "$(ExtensionBundleIdentifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "ec098bfa-89f0-4ff0-b3b1-79c269e0abd0"; - PROVISIONING_PROFILE_SPECIFIER = DevBundle_AdHocExt; + PROVISIONING_PROFILE = "513ffb64-86f0-4c34-ba73-f49c579b334e"; + PROVISIONING_PROFILE_SPECIFIER = DevBundle_DevExt; SKIP_INSTALL = YES; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -16848,8 +16848,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Nynja/Resources/Nynja.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; @@ -16861,8 +16861,8 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D SQLITE_HAS_CODEC -D GRDBCIPHER $(inherited) \"-D\" \"COCOAPODS\" -Xfrontend -debug-time-function-bodies -Xfrontend -warn-long-expression-type-checking=20 -Xfrontend -warn-long-function-bodies=20"; PRODUCT_BUNDLE_IDENTIFIER = "$(BundleIdentifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "6b20b280-0985-4b2b-b941-4913fb8150de"; - PROVISIONING_PROFILE_SPECIFIER = DevBundle_adhoc; + PROVISIONING_PROFILE = "84763be4-0d2a-4728-9e67-b65eb99614ad"; + PROVISIONING_PROFILE_SPECIFIER = DevBundle_Dev; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "Nynja-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; -- GitLab From fb7f2ace79d062780c5f1ab69db24f4cb0e34b13 Mon Sep 17 00:00:00 2001 From: Anton Makarov Date: Fri, 19 Oct 2018 14:19:50 +0300 Subject: [PATCH 2/2] [NY-4525] Can not send contact in chat (#1416) --- Nynja.xcodeproj/project.pbxproj | 16 ++++++++-------- .../ViewController/ContactsViewController.swift | 15 +++++++++------ .../Contacts/WireFrame/ContactsWireframe.swift | 12 ++---------- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/Nynja.xcodeproj/project.pbxproj b/Nynja.xcodeproj/project.pbxproj index a4279caf2..2a2749bc9 100644 --- a/Nynja.xcodeproj/project.pbxproj +++ b/Nynja.xcodeproj/project.pbxproj @@ -16672,8 +16672,8 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = "Nynja-Share/Resources/Nynja-Share.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 9GKQ5AMF2B; @@ -16685,8 +16685,8 @@ OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -DSHARE_EXTENSION -Xfrontend -warn-long-expression-type-checking=20 -Xfrontend -warn-long-function-bodies=20"; PRODUCT_BUNDLE_IDENTIFIER = "$(ExtensionBundleIdentifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "ec098bfa-89f0-4ff0-b3b1-79c269e0abd0"; - PROVISIONING_PROFILE_SPECIFIER = DevBundle_AdHocExt; + PROVISIONING_PROFILE = "ee586ed5-2bed-44bc-ab45-42f41bfa7316"; + PROVISIONING_PROFILE_SPECIFIER = DevBundle_DevExt; SKIP_INSTALL = YES; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -16848,8 +16848,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Nynja/Resources/Nynja.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; @@ -16861,8 +16861,8 @@ OTHER_SWIFT_FLAGS = "$(inherited) -D SQLITE_HAS_CODEC -D GRDBCIPHER $(inherited) \"-D\" \"COCOAPODS\" -Xfrontend -debug-time-function-bodies -Xfrontend -warn-long-expression-type-checking=20 -Xfrontend -warn-long-function-bodies=20"; PRODUCT_BUNDLE_IDENTIFIER = "$(BundleIdentifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE = "6b20b280-0985-4b2b-b941-4913fb8150de"; - PROVISIONING_PROFILE_SPECIFIER = DevBundle_adhoc; + PROVISIONING_PROFILE = "60b08613-9664-4cda-8e81-82eb36b7a786"; + PROVISIONING_PROFILE_SPECIFIER = DevBundle_Dev; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "Nynja-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; diff --git a/Nynja/Modules/Contacts/View/ViewController/ContactsViewController.swift b/Nynja/Modules/Contacts/View/ViewController/ContactsViewController.swift index c6d5d2a0c..1936b49f0 100644 --- a/Nynja/Modules/Contacts/View/ViewController/ContactsViewController.swift +++ b/Nynja/Modules/Contacts/View/ViewController/ContactsViewController.swift @@ -181,7 +181,7 @@ class ContactsViewController: BaseVC, ContactsViewProtocol, ContactCellDelegate, switch contactsViewMode { case .myContacts: - shouldShowSeparator = true + shouldShowSeparator = false transferCoinsView.isHidden = true inviteFriendsView.isHidden = false case .transferContacts: @@ -189,7 +189,7 @@ class ContactsViewController: BaseVC, ContactsViewProtocol, ContactCellDelegate, shouldShowSeparator = true inviteFriendsView.isHidden = true case .allContacts, .shareContact: - shouldShowSeparator = false + shouldShowSeparator = true transferCoinsView.isHidden = true inviteFriendsView.isHidden = true } @@ -253,19 +253,22 @@ extension ContactsViewController: UITableViewDelegate { } } + +// MARK: - Layout + extension ContactsViewController { - struct Constraints { + enum Constraints { - struct tableView { + enum tableView { static let topInset = 16.0 } - struct controlContainerView { + enum controlContainerView { static let bottomInset: CGFloat = 28.0 } - struct transferCoinsView { + enum transferCoinsView { static let inset = CGFloat(16.0.adjustedByWidth) static let height = CGFloat(70.0.adjustedByWidth) } diff --git a/Nynja/Modules/Contacts/WireFrame/ContactsWireframe.swift b/Nynja/Modules/Contacts/WireFrame/ContactsWireframe.swift index 80b235b69..faac7c3c9 100644 --- a/Nynja/Modules/Contacts/WireFrame/ContactsWireframe.swift +++ b/Nynja/Modules/Contacts/WireFrame/ContactsWireframe.swift @@ -8,7 +8,6 @@ import UIKit - enum ContactViewMode { case myContacts case allContacts @@ -21,16 +20,13 @@ class ContactsWireFrame: ContactsWireFrameProtocol { weak var navigation : UINavigationController? weak var mainWF: MainWireFrame? - @discardableResult private func presentContacts(navigation: UINavigationController, contactsViewMode: ContactViewMode, - mainWireFrame: MainWireFrame? = nil) -> UIViewController { + mainWireFrame: MainWireFrame? = nil) { self.navigation = navigation self.mainWF = mainWireFrame let view = makeContactsView(for: contactsViewMode) navigation.pushViewController(view, animated: false) - - return view } private func makeContactsView(for contactsViewMode: ContactViewMode) -> UIViewController { @@ -57,11 +53,7 @@ class ContactsWireFrame: ContactsWireFrameProtocol { extension ContactsWireFrame { func presentContactsForSharing(navigation: UINavigationController, mainWireFrame: MainWireFrame?) { - let view = presentContacts( - navigation: navigation, - contactsViewMode: .shareContact, - mainWireFrame: mainWireFrame) - navigation.viewControllers = [view] + presentContacts(navigation: navigation, contactsViewMode: .shareContact, mainWireFrame: mainWireFrame) } func presentAllContacts(navigation: UINavigationController, mainWireFrame: MainWireFrame?) { -- GitLab